Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

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;
@@ -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;

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)
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
+      <?php $tabActive = ($iCharges and ($tabActive == 'closed' or $tabActive == 'myExecution')) ? 'myExecution' : 'other';?>
       <?php if($iCharges): ?>
-      <?php $tabActive = ($tabActive == '' or $tabActive == 'myExecution') ? 'myExecution' : 'other';?>
       <ul class="nav nav-tabs">
         <li class="<?php if($tabActive == 'myExecution') echo 'active';?>"><?php echo html::a('#myExecution', $lang->execution->involved, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
         <li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>

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 = '禅道用户';

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'; 

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)
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
+      <?php $tabActive = ($iCharges and ($tabActive == 'closed' or $tabActive == 'myProduct')) ? 'myProduct' : 'other';?>
       <?php if($iCharges): ?>
-      <?php $tabActive = ($tabActive == '' or $tabActive == 'myProduct') ? 'myProduct' : 'other';?>
       <ul class="nav nav-tabs">
         <li class="<?php if($tabActive == 'myProduct') echo 'active';?>"><?php echo html::a('#myProduct', $lang->product->mine, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
         <li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>

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;

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)
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
+      <?php $tabActive = ($iCharges and ($tabActive == 'closed' or $tabActive == 'myProject')) ? 'myProject' : 'other';?>
       <?php if($iCharges): ?>
-      <?php $tabActive = ($tabActive == '' or $tabActive == 'myProject') ? 'myProject' : 'other';?>
       <ul class="nav nav-tabs">
         <li class="<?php if($tabActive == 'myProject') echo 'active';?>"><?php echo html::a('#myProject', $lang->project->myProject, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
         <li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>