diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9d3c892a4b..7106e70c76 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -225,8 +225,8 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> /* Execution menu. */ $lang->execution->homeMenu = new stdclass(); +$lang->execution->homeMenu->all = array('link' => "{$lang->execution->all}|execution|all|"); if($config->systemMode == 'new') $lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|"); -if($config->systemMode == 'classic') $lang->execution->homeMenu->all = array('link' => "{$lang->execution->all}|execution|all|"); $lang->execution->menu = new stdclass(); $lang->execution->menu->task = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); diff --git a/module/execution/control.php b/module/execution/control.php index b9b9f02de1..9c5f2b4bc0 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2888,7 +2888,7 @@ class execution extends control $this->view->executionStats = $this->project->getStats($projectID, $status, $productID, 0, 30, $orderBy, $pager); $this->view->productID = $productID; $this->view->projectID = $projectID; - $this->view->projects = $this->project->getPairsByModel(); + $this->view->projects = array('') + $this->project->getPairsByProgram(); $this->view->pager = $pager; $this->view->orderBy = $orderBy; $this->view->users = $this->loadModel('user')->getPairs('noletter'); diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index f342ab966f..f8298ba8bf 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -11,7 +11,7 @@ */ /* Fields. */ $lang->execution->allExecutions = 'Alle'; -$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->allExecutionAB = 'Execution List'; $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = 'Typ'; $lang->execution->name = 'Name'; @@ -99,6 +99,7 @@ $lang->execution->recent = 'Recent visits: '; $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->noTeam = 'No team members at the moment'; $lang->execution->or = ' or '; +$lang->execution->selectProject = 'Please select project'; if($this->config->systemMode == 'new') $lang->execution->copyTeamTip = "select Project/{$lang->execution->common} to copy its members"; if($this->config->systemMode == 'classic') $lang->execution->copyTeamTip = "select Project/{$lang->executionCommon} to copy its members"; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 10fa7d2b20..c395805005 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -11,7 +11,7 @@ */ /* Fields. */ $lang->execution->allExecutions = 'All ' . $lang->executionCommon . 's'; -$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->allExecutionAB = 'Execution List'; $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = $lang->executionCommon . 'Type'; $lang->execution->name = $lang->executionCommon . 'Name'; @@ -100,6 +100,7 @@ $lang->execution->recent = 'Recent visits: '; $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->noTeam = 'No team members at the moment'; $lang->execution->or = ' or '; +$lang->execution->selectProject = 'Please select project'; if($this->config->systemMode == 'new') $lang->execution->copyTeamTip = "select Project/{$lang->execution->common} to copy its members"; if($this->config->systemMode == 'classic') $lang->execution->copyTeamTip = "select Project/{$lang->executionCommon} to copy its members"; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 9049dc47a2..5c66827cc5 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -11,7 +11,7 @@ */ /* Fields. */ $lang->execution->allExecutions = 'Tous les ' . $lang->executionCommon . 's'; -$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->allExecutionAB = 'Execution List'; $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = $lang->executionCommon . 'Type'; $lang->execution->name = $lang->executionCommon . 'Name'; @@ -99,6 +99,7 @@ $lang->execution->recent = 'Recent visits: '; $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->noTeam = 'No team members at the moment'; $lang->execution->or = ' or '; +$lang->execution->selectProject = 'Please select project'; if($this->config->systemMode == 'new') $lang->execution->copyTeamTip = "select Project/{$lang->execution->common} to copy its members"; if($this->config->systemMode == 'classic') $lang->execution->copyTeamTip = "select Project/{$lang->executionCommon} to copy its members"; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index e3f827c4e9..c445f27cc7 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -11,7 +11,7 @@ */ /* Fields. */ $lang->execution->allExecutions = 'Tất cả ' . $lang->executionCommon; -$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->allExecutionAB = 'Execution List'; $lang->execution->id = 'ID '.$lang->executionCommon; $lang->execution->type = 'Loại'; $lang->execution->name = "Tên {$lang->executionCommon}"; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 497fa6179d..20885cb59a 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -11,7 +11,7 @@ */ /* 字段列表。*/ $lang->execution->allExecutions = '所有' . $lang->executionCommon; -$lang->execution->allExecutionAB = "所有{$lang->execution->common}"; +$lang->execution->allExecutionAB = "{$lang->execution->common}列表"; $lang->execution->id = $lang->executionCommon . '编号'; $lang->execution->type = $lang->executionCommon . '类型'; $lang->execution->name = $lang->executionCommon . '名称'; @@ -100,6 +100,7 @@ $lang->execution->recent = '近期访问:'; $lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制'; $lang->execution->noTeam = '暂时没有团队成员'; $lang->execution->or = '或'; +$lang->execution->selectProject = '请选择项目'; if($this->config->systemMode == 'new') $lang->execution->copyTeamTip = "可以选择复制项目或{$lang->execution->common}团队的成员"; if($this->config->systemMode == 'classic') $lang->execution->copyTeamTip = "可以选择复制{$lang->executionCommon}团队的成员"; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index 868dacd013..d5f44425f2 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -11,7 +11,7 @@ */ /* 欄位列表。*/ $lang->execution->allExecutions = '所有' . $lang->executionCommon; -$lang->execution->allExecutionAB = "所有{$lang->execution->common}"; +$lang->execution->allExecutionAB = "{$lang->execution->common}清單"; $lang->execution->id = $lang->executionCommon . '編號'; $lang->execution->type = $lang->executionCommon . '類型'; $lang->execution->name = $lang->executionCommon . '名稱'; @@ -99,6 +99,7 @@ $lang->execution->noLinkProduct = "階段沒有關聯{$lang->productCommon}"; $lang->execution->recent = '近期訪問:'; $lang->execution->copyNoExecution = '沒有可用的' . $lang->executionCommon . '來複制'; $lang->execution->noTeam = '暫時沒有團隊成員'; +$lang->execution->selectProject = '請選擇項目'; $lang->execution->start = "開始"; $lang->execution->activate = "激活"; diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index c7bf1654d5..2d90badfc7 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -31,6 +31,11 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp execution->featureBar['all'] as $key => $label):?> createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "{$label}", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?> + +