From fabc81d71e5f45757b0c221e588503c5d5446252 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 14 Jul 2021 13:37:07 +0800 Subject: [PATCH 1/4] * Adjust the tab active when I am not admin and current project is closed. --- module/execution/view/ajaxgetdropmenu.html.php | 9 +++++++-- module/product/view/ajaxgetdropmenu.html.php | 4 +++- module/project/view/ajaxgetdropmenu.html.php | 9 +++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php index 759fb6a7a6..9a8f6f0999 100644 --- a/module/execution/view/ajaxgetdropmenu.html.php +++ b/module/execution/view/ajaxgetdropmenu.html.php @@ -73,7 +73,12 @@ foreach($executions as $projectID => $projectExecutions) $others++; } - else if($execution->status == 'done' or $execution->status == 'closed') $closedExecutionsHtml .= html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'"); + else if($execution->status == 'done' or $execution->status == 'closed') + { + $closedExecutionsHtml .= html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'"); + + if($selected == 'selected') $tabActive = 'closed'; + } /* If the execution is the last one in the project, print the closed label. */ if(!isset($projectExecutions[$index + 1])) @@ -90,8 +95,8 @@ foreach($executions as $projectID => $projectExecutions)
+ -
  • execution->involved, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?>
  • project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?>
  • diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index 8695328af0..2babe05de0 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -89,6 +89,8 @@ foreach($products as $programID => $programProducts) else if($product->status == 'closed') { $closedProductsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'"); + + if($selected == 'selected') $tabActive = 'closed'; } /* If the programID is greater than 0, the product is the last one in the program, print the closed label. */ @@ -106,8 +108,8 @@ foreach($products as $programID => $programProducts)
    + -
    • product->mine, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?>
    • product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?>
    • diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php index 887460267e..7a259ce1bd 100644 --- a/module/project/view/ajaxgetdropmenu.html.php +++ b/module/project/view/ajaxgetdropmenu.html.php @@ -87,7 +87,12 @@ foreach($projects as $programID => $programProjects) $others++; } - else if($project->status == 'done' or $project->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $project->id), $project->name, '', "class='$selected' title='{$project->name}' data-key='" . zget($projectsPinYin, $project->name, '') . "'"); + else if($project->status == 'done' or $project->status == 'closed') + { + $closedProjectsHtml .= html::a(sprintf($link, $project->id), $project->name, '', "class='$selected' title='{$project->name}' data-key='" . zget($projectsPinYin, $project->name, '') . "'"); + + if($selected == 'selected') $tabActive = 'closed'; + } /* If the programID is greater than 0, the project is the last one in the program, print the closed label. */ if($programID and !isset($programProjects[$index + 1])) @@ -105,8 +110,8 @@ foreach($projects as $programID => $programProjects)
      + -
      • project->myProject, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?>
      • project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?>
      • From 182b8217f3075ac3a46b77bd1ccdce09405875ba Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 14 Jul 2021 13:42:30 +0800 Subject: [PATCH 2/4] finish task #40111 --- module/execution/control.php | 2 +- module/project/control.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 1afaef1b7b..c0c2c88a81 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1329,7 +1329,7 @@ class execution extends control $this->view->position[] = $this->view->title; $this->view->executions = array('' => '') + $this->execution->getList($projectID); $this->view->groups = $this->loadModel('group')->getPairs(); - $this->view->allProducts = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID); + $this->view->allProducts = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID, 'noclosed'); $this->view->acl = $acl; $this->view->plan = $plan; $this->view->name = $name; diff --git a/module/project/control.php b/module/project/control.php index c639385e1c..9b0badd995 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -366,7 +366,7 @@ class project extends control $this->view->users = $this->user->getPairs('noclosed|nodeleted'); $this->view->copyProjects = $this->project->getPairsByModel(); $this->view->products = $products; - $this->view->allProducts = array('0' => '') + $this->program->getProductPairs($programID); + $this->view->allProducts = array('0' => '') + $this->program->getProductPairs($programID, 'assign', 'noclosed'); $this->view->productPlans = array('0' => '') + $productPlans; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products)); $this->view->programID = $programID; From 7305bb4f1282c24015211e1b3bd5d3f254b7c539 Mon Sep 17 00:00:00 2001 From: lichengjun Date: Wed, 14 Jul 2021 13:46:21 +0800 Subject: [PATCH 3/4] *fix code format. --- module/gitlab/lang/zh-cn.php | 2 +- module/group/lang/resource.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 0a3492d3f8..40a0650177 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -8,7 +8,7 @@ $lang->gitlab->bindUser = '绑定用户'; $lang->gitlab->webhook = 'webhook'; $lang->gitlab->bindProduct = '关联产品'; $lang->gitlab->importIssue = '关联issue'; -$lang->gitlab->delete = '删除'; +$lang->gitlab->delete = '删除gitlab'; $lang->gitlab->confirmDelete = '确认删除该gitlab吗？'; $lang->gitlab->gitlabAccount = 'gitlab用户'; $lang->gitlab->zentaoAccount = '禅道用户'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 3047ffafe5..6ccdb8cf83 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1123,7 +1123,6 @@ $lang->resource->gitlab->browse = 'browse'; $lang->resource->gitlab->create = 'create'; $lang->resource->gitlab->edit = 'edit'; $lang->resource->gitlab->importIssue = 'importIssue'; -$lang->resource->gitlab->webhook = 'webhook'; $lang->resource->gitlab->delete = 'delete'; $lang->resource->gitlab->bindUser = 'bindUser'; $lang->resource->gitlab->bindProduct = 'bindProduct'; @@ -1132,7 +1131,6 @@ $lang->gitlab->methodOrder[5] = 'browse'; $lang->gitlab->methodOrder[10] = 'create'; $lang->gitlab->methodOrder[15] = 'edit'; $lang->gitlab->methodOrder[20] = 'importIssue'; -$lang->gitlab->methodOrder[25] = 'webhook'; $lang->gitlab->methodOrder[30] = 'delete'; $lang->gitlab->methodOrder[35] = 'bindUser'; $lang->gitlab->methodOrder[40] = 'bindProduct'; From a7f8cd98c42c2577c6825a209b06ff19b1d90515 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 14 Jul 2021 13:48:05 +0800 Subject: [PATCH 4/4] * Fix a bug. --- module/execution/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index c0c2c88a81..a563257356 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1882,9 +1882,9 @@ class execution extends control ->fetchGroup('root', 'account'); $projectCount = 0; - $kanbanGroup = array(); $statusCount = array(); $myExecutions = array(); + $kanbanGroup = array(); foreach(array_keys($projects) as $projectID) { foreach(array_keys($this->lang->execution->statusList) as $status) @@ -1909,7 +1909,7 @@ class execution extends control krsort($kanbanGroup); $this->view->title = $this->lang->execution->executionKanban; - $this->view->kanbanGroup = array($myExecutions) + $kanbanGroup; + $this->view->kanbanGroup = empty($myExecutions) ? $kanbanGroup : array($myExecutions) + $kanbanGroup; $this->view->projects = $projects; $this->view->projectCount = $projectCount; $this->view->statusCount = $statusCount;