diff --git a/module/branch/control.php b/module/branch/control.php index ab315b59f7..2606058728 100644 --- a/module/branch/control.php +++ b/module/branch/control.php @@ -20,7 +20,6 @@ class branch extends control */ public function manage($productID) { - $this->lang->product->menu = $this->lang->product->setMenu; $this->lang->product->switcherMenu = $this->loadModel('product')->getSwitcher($productID); $moduleIndex = array_search('branch', $this->lang->noMenuModule); diff --git a/module/bug/control.php b/module/bug/control.php index 4aa2a53718..e982938b20 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -478,20 +478,25 @@ class bug extends control /* Get products and projects. */ $products = $this->products; + $projects = array('' => ''); if($projectID) { $products = array(); $productList = $this->product->getOrderedProducts('all', 40, $projectID); foreach($productList as $product) $products[$product->id] = $product->name; - $project = $this->loadModel('project')->getByID($projectID); - $projects = array($projectID => $project->name); + $project = $this->loadModel('project')->getByID($projectID); + $projects += array($projectID => $project->name); } else { - $projects = $this->product->getProjectPairsByProduct($productID, $branch); + $projects += $this->product->getProjectPairsByProduct($productID, $branch); } + /* Get executions. */ + $executions = array('' => ''); + if(isset($projects[$projectID])) $executions += $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID); + /* Set custom. */ foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field; $this->view->customFields = $customFields; @@ -507,7 +512,7 @@ class bug extends control $this->view->moduleOptionMenu = $moduleOptionMenu; $this->view->stories = $stories; $this->view->projects = $projects; - $this->view->executions = $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID); + $this->view->executions = $executions; $this->view->builds = $builds; $this->view->moduleID = (int)$moduleID; $this->view->projectID = $projectID; @@ -653,7 +658,6 @@ class bug extends control elseif($from == 'repo') { session_write_close(); - $this->lang->set('menugroup.bug', 'repo'); $repos = $this->loadModel('repo')->getRepoPairs($this->session->PRJ); $this->repo->setMenu($repos); $this->lang->bug->menu = $this->lang->repo->menu; diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 78fcc13036..4710eda4bf 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -263,6 +263,7 @@ function loadProductProjects(productID) function loadProductExecutions(productID, projectID = 0) { if(!projectID) projectID = $('#project').find("option:selected").val(); + if(!projectID) productID = 0; required = $('#execution_chosen').hasClass('required'); branch = $('#branch').val(); if(typeof(branch) == 'undefined') branch = 0; diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index ad8b139165..1bdd2ad2b7 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -95,7 +95,7 @@ js::set('oldProjectID', $projectID);
- +
diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 38427c0c35..be8732aebd 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -575,46 +575,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->report = 'reporting'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 087b5c8e6f..fd35da3641 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -577,45 +577,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 863cfc70db..0649e51949 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -567,45 +567,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index b607d3c952..8ebf527bc8 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -573,45 +573,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 03c398e3d9..ba4ace478c 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -360,7 +360,7 @@ $lang->execution->qaMenu->qa = array('link' => '仪表盘|execution|qa|e $lang->execution->qaMenu->bug = array('link' => 'Bug|execution|bug|executionID=%s'); $lang->execution->qaMenu->testcase = array('link' => '用例|execution|testcase|executionID=%s'); $lang->execution->qaMenu->testtask = array('link' => '测试单|execution|testtask|executionID=%s'); -$lang->execution->qaMenu->testreport = array('link' => '报告|execution|testreport|exeutionID=%s'); +//$lang->execution->qaMenu->testreport = array('link' => '报告|testreport|browse|exeutionID=%s&type=execution'); $lang->execution->settingMenu = new stdclass(); $lang->execution->settingMenu = new stdclass(); diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 93208c2619..49b27fd9e1 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -576,43 +576,7 @@ $lang->message = new stdclass(); $lang->search = new stdclass(); /* 菜單分組。*/ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; /* Nav group.*/ $lang->navGroup = new stdclass(); diff --git a/module/common/model.php b/module/common/model.php index 42122af446..4ac68b40b6 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -751,19 +751,18 @@ class commonModel extends model * Print the module menu. * * @param string $moduleName + * @param string $methodName * @static * @access public * @return void */ - public static function printModuleMenu($moduleName) + public static function printModuleMenu($moduleName, $methodName) { global $config, $lang, $app; - $moduleName = $app->rawModule; - $methodName = $app->rawMethod; /* Set main menu by openApp. */ $openApp = $app->openApp ? $app->openApp : $lang->navGroup->$moduleName; - if(in_array($openApp, array('admin', 'repo', 'ops', 'feedback'))) return; + if(in_array($moduleName, array('admin', 'repo', 'ops', 'feedback'))) return; if($openApp == 'my') self::getMyModuleMenu($moduleName, $methodName); if($openApp == 'project') self::getProjectModuleMenu($moduleName, $methodName); @@ -813,8 +812,6 @@ class commonModel extends model /* The beginning of the menu. */ echo $isMobile ? '' : "