diff --git a/module/execution/control.php b/module/execution/control.php index 6dd8a9770e..0fc4ed0ff9 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2500,7 +2500,8 @@ class execution extends control $this->view->module = $module; $this->view->method = $method; $this->view->extra = $extra; - $this->view->executions = $this->execution->getByProject($execution->project); + $this->view->projects = $this->project->getPairsByModel(); + $this->view->executions = $this->execution->getList(); $this->display(); } diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php index fe4e0a05fe..2debb51b63 100644 --- a/module/execution/view/ajaxgetdropmenu.html.php +++ b/module/execution/view/ajaxgetdropmenu.html.php @@ -21,15 +21,16 @@ $executionsPinYin = common::convert2Pinyin($executionNames); foreach($executions as $execution) { + $executionName = zget($projects, $execution->project) . '/' . $execution->name; if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM == $this->app->user->account) { - $myProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $execution->name, '', "class='text-important' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); + $myProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='text-important' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); } else if($execution->status != 'done' and $execution->status != 'closed' and !($execution->PM == $this->app->user->account)) { - $normalProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $execution->name, '', "title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); + $normalProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); } - else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $execution->name, '', "title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); + else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); } ?>