* Finish task#43855. Approval page issue is fixed.
This commit is contained in:
+11
-2
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user