* Finish task#43855. Approval page issue is fixed.

This commit is contained in:
dingguodong
2021-11-09 16:21:08 +08:00
parent efb3a369c8
commit 8e4bf08e4f
4 changed files with 70 additions and 49 deletions
+11 -2
View File
@@ -290,8 +290,8 @@ class mr extends control
/**
* Approval for this MR.
*
* @param mixed $MRID
* @param mixed $action
* @param int $MRID
* @param string $action
* @return void
*/
public function approval($MRID, $action = 'approve')
@@ -307,6 +307,15 @@ class mr extends control
return $this->send($result);
}
$showCompileResult = false;
if(!empty($MR->compileStatus))
{
$showCompileResult = true;
$this->app->loadLang('compile'); /* Import lang. */
$this->view->compileUrl = $this->createLink('job', 'view', "jobID={$MR->jobID}&compileID={$MR->compileID}");
}
$this->view->showCompileResult = $showCompileResult;
$this->view->MR = $MR;
$this->view->action = $action;
$this->view->actions = $this->loadModel('action')->getList('mrapproval', $MRID);