* fix error.
This commit is contained in:
@@ -674,7 +674,7 @@ class projectModel extends model
|
||||
if(isset($project->budget) and $program->budget != 0)
|
||||
{
|
||||
$availableBudget = $this->loadModel('program')->getBudgetLeft($program);
|
||||
if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->project->beyondParentBudget;
|
||||
if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
|
||||
}
|
||||
|
||||
/* Judge products not empty. */
|
||||
|
||||
@@ -1429,7 +1429,16 @@ class testtaskModel extends model
|
||||
foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
|
||||
break;
|
||||
case 'status':
|
||||
echo $caseChanged ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testcase', $run);
|
||||
if($caseChanged)
|
||||
{
|
||||
echo "<span class='warning'>{$this->lang->testcase->changed}</span>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$status = $this->processStatus('testcase', $run);
|
||||
if($run->status == $status) $status = $this->processStatus('testtask', $run);
|
||||
echo $status;
|
||||
}
|
||||
break;
|
||||
case 'precondition':
|
||||
echo $run->precondition;
|
||||
|
||||
@@ -116,12 +116,7 @@ class xuanxuanIm extends imModel
|
||||
|
||||
public function chatAddAction($chatId = '', $action = '', $actorId = '', $result = '', $comment = '')
|
||||
{
|
||||
if(!$this->loadModel('action')->checkLogLevel('chat', $action)) return;
|
||||
|
||||
$account = $this->dao->select('account')->from(TABLE_USER)->where('id')->eq($actorId)->fetch('account');
|
||||
$actor = !empty($account) ? $account : '';
|
||||
$extra = json_encode(array('actorId' => $actorId));
|
||||
$this->loadModel('action')->create('chat', $chatId, $action, $comment, $extra, $actor);
|
||||
return;
|
||||
}
|
||||
|
||||
public function userAddAction($user, $actionType, $result, $comment = '', $common = false)
|
||||
|
||||
Reference in New Issue
Block a user