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

module/execution/control.php

@@ -2607,15 +2607,10 @@ class execution extends control
     public function kanban($executionID, $browseType = 'all', $orderBy = 'id_asc', $groupBy = 'default')
     {
         $this->app->loadLang('bug');
+        $this->app->loadLang('kanban');
 
         if(empty($groupBy)) $groupBy = 'default';
 
-        /* Set Session. */
-        $this->session->set('execLaneType', $browseType);
-        $this->session->set('execGroupBy', $groupBy);
-        $this->session->set('storyList', $this->app->getURI(true), 'execution');
-        $this->session->set('rdSearchValue', '');
-
         $this->lang->execution->menu = new stdclass();
         $execution = $this->commonAction($executionID);
         if($execution->type != 'kanban') return print(js::locate(inlink('view', "executionID=$executionID")));
@@ -2626,6 +2621,12 @@ class execution extends control
             unset($this->lang->kanban->group->task['story']);
         }
 
+        /* Set Session. */
+        $this->session->set('execGroupBy', $groupBy);
+        $this->session->set('storyList', $this->app->getURI(true), 'execution');
+        $this->session->set('rdSearchValue', '');
+        $this->session->set('execLaneType', $browseType);
+
         $kanbanData       = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
         $executionActions = array();
         foreach($this->config->execution->statusActions as $action)

module/execution/css/all.css

@@ -15,3 +15,5 @@
 .dtable-cell[data-sort='down'] .dtable-sort:after  {color: #000; opacity: 1}
 .dtable .toggle-icon {border-radius: 50%; border-style: solid;}
 .dtable-nested-toggle.is-no-child {display: block; opacity: 0; pointer-events: none;}
+
+.dtable-row.is-normal .dtable-cell[data-col="name"] {padding-left: 20px;}

module/execution/js/edit.js

@@ -123,7 +123,7 @@ $(function()
             hidePlanBox(attribute);
         })
 
-        $('#attribute').change();
+        hidePlanBox(executionAttr);
     }
 })
 var lastProjectID = $("#project").val();

module/execution/model.php

@@ -9,8 +9,6 @@
  * @version     $Id: model.php 5118 2013-07-12 07:41:41Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-?>
-<?php
 class executionModel extends model
 {
     /* The members every linking. */
@@ -1072,7 +1070,7 @@ class executionModel extends model
                     if($sibling->status != 'wait')
                     {
                         $siblingsAllWait = false;
-                        return $pointOutStages;
+                        break;
                     }
                 }
 
@@ -1092,7 +1090,7 @@ class executionModel extends model
                     if(!dao::isError())
                     {
                         $changes    = common::createChanges($parent, $newParent);
-                        $actionType = $parentStatus == 'doing' ? 'startbychildedit' : 'waitbychild';
+                        $actionType = $parentStatus == 'doing' ? 'started' : 'waitbychild';
                         $actionID   = $this->action->create('execution', $parentID, $actionType, '', $actionType);
                         $this->action->logHistory($actionID, $changes);
 
@@ -1121,7 +1119,7 @@ class executionModel extends model
         if(!dao::isError())
         {
             $changes  = common::createChanges($selfAndChildren[$executionID], $newExecution);
-            $actionID = $this->action->create('execution', $executionID, 'Edited');
+            $actionID = $this->action->create('execution', $executionID, 'Started');
             $this->action->logHistory($actionID, $changes);
 
             if($type != 'stage') return '';
@@ -1182,7 +1180,7 @@ class executionModel extends model
         if(!dao::isError())
         {
             $changes  = common::createChanges($selfAndChildren[$executionID], $newExecution);
-            $actionID = $this->action->create('execution', $executionID, 'Edited');
+            $actionID = $this->action->create('execution', $executionID, strtoupper($status));
             $this->action->logHistory($actionID, $changes);
 
             if($type != 'stage') return '';

module/execution/view/ajaxgetdropmenu.html.php

@@ -206,22 +206,22 @@ $(function()
         }
     });
 
-    $('#swapper #dropMenu').on('onSearchComplete', function(event, value)
+    $('#swapper #dropMenu').on('onSearchComplete', function()
     {
-        if($('.list-group.executions').height() == 0)
-        {
-            $('#closed').attr("hidden", true);
-            $('#gray-line').attr("hidden", true);
-        }
-
         var listItem = $(this).find('.has-list');
-        listItem.each(function ()
+        listItem.each(function()
         {
             $(this).css('display','')
             var $hidden = $(this).find('.hidden');
             var $item   = $(this).find('.search-list-item');
             if($hidden.length == $item.length) $(this).css('display','none');
         });
+
+        if($('.list-group.executions').height() == 0)
+        {
+            $('#closed').attr("hidden", true);
+            $('#gray-line').attr("hidden", true);
+        }
     });
 })
 </script>

module/execution/view/edit.html.php

@@ -15,6 +15,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('isStage', $execution->type == 'stage');?>
+<?php js::set('executionAttr', $execution->attribute);?>
 <?php js::set('manageProductsLang', $lang->project->manageProducts);?>
 <?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>
 <div id='mainContent' class='main-content'>
@@ -161,7 +162,7 @@
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr class="<?php echo $hidden;?>">
-          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <th id='productTitle'><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6 productBox">
@@ -252,7 +253,7 @@
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr>
-          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <th id="productTitle"><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6 productBox">
@@ -261,7 +262,7 @@
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                     <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
                       <span class='input-group-addon'><?php echo $lang->product->common;?></span>
-                      <?php $disabled = $execution->type == 'stage' ? "disabled='disabled'" : '';?>
+                      <?php $disabled = ($project->model == 'waterfall' or $project->model == 'waterfallplus') ? "disabled='disabled'" : '';?>
                       <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
                       <?php if($execution->type == 'stage' and !$project->division) echo html::hidden("products[$i]", $product->id);?>
                     </div>

module/execution/view/view.html.php

@@ -345,7 +345,7 @@
               </div>
             </div>
             <?php endif;?>
-            <?php if($execution->projectInfo->hasProduct or $execution->projectInfo->model == 'scrum'):?>
+            <?php if(!(strpos($execution->projectInfo->model, 'waterfall') !== false and (empty($execution->projectInfo->hasProduct) or in_array($execution->attribute, array('request', 'review'))))):?>
             <div class="detail">
               <div class="detail-title"><strong><?php echo $lang->execution->linkPlan;?></strong></div>
               <div class="detail-content">