Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#36499.

Browse Source
This commit is contained in:
qiyu-xie
2021-03-09 16:57:21 +08:00
parent 074bce86fd
commit a295e11e63
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menuOrder.php
+12 -13
View File
@@ -82,19 +82,18 @@ $lang->release->menuOrder = $lang->product->menuOrder;
$lang->branch->menuOrder = $lang->product->menuOrder;
/* project menu order. */
$lang->execution->menuOrder[5] = 'index';
$lang->execution->menuOrder[10] = 'task';
$lang->execution->menuOrder[15] = 'kanban';
$lang->execution->menuOrder[20] = 'burn';
$lang->execution->menuOrder[25] = 'view';
$lang->execution->menuOrder[30] = 'story';
$lang->execution->menuOrder[35] = 'bug';
$lang->execution->menuOrder[40] = 'build';
$lang->execution->menuOrder[45] = 'testtask';
$lang->execution->menuOrder[50] = 'doc';
$lang->execution->menuOrder[55] = 'product';
$lang->execution->menuOrder[60] = 'team';
$lang->execution->menuOrder[65] = 'more';
$lang->execution->menuOrder[5] = 'task';
$lang->execution->menuOrder[10] = 'kanban';
$lang->execution->menuOrder[15] = 'burn';
$lang->execution->menuOrder[20] = 'view';
$lang->execution->menuOrder[25] = 'story';
$lang->execution->menuOrder[30] = 'bug';
$lang->execution->menuOrder[35] = 'build';
$lang->execution->menuOrder[40] = 'testtask';
$lang->execution->menuOrder[45] = 'doc';
$lang->execution->menuOrder[50] = 'product';
$lang->execution->menuOrder[55] = 'team';
$lang->execution->menuOrder[60] = 'more';
$lang->task->menuOrder = $lang->execution->menuOrder;
$lang->build->menuOrder = $lang->execution->menuOrder;
module/common/lang/zh-cn.php
+17 -14
View File
@@ -338,19 +338,22 @@ $lang->story->menu = $lang->product->menu;
/* 执行视图菜单设置。*/
$lang->execution = new stdclass();
$lang->execution->menu = new stdclass();
$lang->execution->menu->index = '仪表盘|execution|index|';
$lang->execution->menu->task = array('link' => '任务|execution|task|executionID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
$lang->execution->menu->kanban = array('link' => '看板|execution|kanban|executionID=%s');
$lang->execution->menu->burn = array('link' => '燃尽图|execution|burn|executionID=%s');
$lang->execution->menu->view = array('link' => '视图|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
$lang->execution->menu->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
$lang->execution->menu->bug = array('link' => 'Bug|execution|bug|executionID=%s');
$lang->execution->menu->build = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build');
$lang->execution->menu->testtask = array('link' => '测试单|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
$lang->execution->menu->doc = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc');
$lang->execution->menu->product = $lang->productCommon . '|execution|manageproducts|executionID=%s';
$lang->execution->menu->team = array('link' => '团队|execution|team|executionID=%s', 'alias' => 'managemembers');
$lang->execution->menu->more = array('link' => '更多|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover');
$lang->execution->menu->index = '仪表盘|execution|index|';
$lang->execution->menu->list = '执行|execution|all|';
$lang->execution->viewMenu = new stdclass();
$lang->execution->viewMenu->task = array('link' => '任务|execution|task|executionID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
$lang->execution->viewMenu->kanban = array('link' => '看板|execution|kanban|executionID=%s');
$lang->execution->viewMenu->burn = array('link' => '燃尽图|execution|burn|executionID=%s');
$lang->execution->viewMenu->view = array('link' => '视图|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
$lang->execution->viewMenu->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
$lang->execution->viewMenu->bug = array('link' => 'Bug|execution|bug|executionID=%s');
$lang->execution->viewMenu->build = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build');
$lang->execution->viewMenu->testtask = array('link' => '测试单|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
$lang->execution->viewMenu->doc = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc');
$lang->execution->viewMenu->product = $lang->productCommon . '|execution|manageproducts|executionID=%s';
$lang->execution->viewMenu->team = array('link' => '团队|execution|team|executionID=%s', 'alias' => 'managemembers');
$lang->execution->viewMenu->more = array('link' => '更多|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover');
$lang->execution->subMenu = new stdclass();
$lang->execution->subMenu->view = new stdclass();
@@ -367,7 +370,7 @@ $lang->execution->subMenu->more->whitelist = array('link' => '白名单|executio
$lang->execution->subMenu->more->action = array('link' => '动态|execution|dynamic|executionID=%s');
$lang->execution->subMenu->more->view = array('link' => '概况|execution|view|executionID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->execution->dividerMenu = ',task,story,doc,';
$lang->execution->dividerMenu = ',story,doc,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/execution/control.php
+2 -2
View File
@@ -110,8 +110,8 @@ class execution extends control
$this->view->executions = $this->executions;
$this->view->execution = $execution;
$this->view->childExecutions = $childExecutions;
$this->view->products = $products;
$this->view->teamMembers = $teamMembers;
$this->view->products = $products;
$this->view->teamMembers = $teamMembers;
return $execution;
}
module/execution/model.php
+2
View File
@@ -62,6 +62,8 @@ class executionModel extends model
*/
public function setMenu($executions, $executionID, $buildID = 0, $extra = '')
{
if($this->app->rawMethod != 'index' and $this->app->rawMethod != 'all') $this->lang->execution->menu = $this->lang->execution->viewMenu;
if(empty($executions))
{
$project = $this->loadModel('project')->getByID($this->session->PRJ);