diff --git a/module/execution/control.php b/module/execution/control.php index 41306fdc39..8bad979a79 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2063,6 +2063,16 @@ class execution extends control $executionID = $this->execution->saveState((int)$executionID, $this->executions); $execution = $this->execution->getById($executionID, true); + + $execution->projectInfo = $this->loadModel('project')->getByID($execution->project); + + if($this->config->systemMode == 'new') + { + $programList = array_filter(explode(',', $execution->projectInfo->path)); + array_pop($programList); + $this->view->programList = $this->loadModel('program')->getPairsByList($programList); + } + $type = $this->config->vision == 'lite' ? 'kanban' : 'stage,sprint,kanban'; if(empty($execution) || strpos($type, $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back')); diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 10aaac97db..2e10b34ddc 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -174,6 +174,52 @@

+ config->systemMode == 'new'):?> +
+
+ project->parent;?> +
+
+
+
+ projectInfo->grade > 1):?> + + $name) + { + if($name != $end) + { + echo common::hasPriv('program', 'product')? html::a($this->createLink('program', 'product', "programID=$id"), $name) . '/ ' : $name . '/ '; + } + else + { + echo common::hasPriv('program', 'product') ? html::a($this->createLink('program', 'product', "programID=$id"), $name) : $name; + } + } + ?> + +
+
+
+
+ + config->systemMode == 'new'):?> +
+
+ project->project;?> +
+
+
+
+ + createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name) : $execution->projectInfo->name;?> +
+
+
+
+ attribute, array('request', 'design', 'review'))): ?>