Merge branch 'sprint/182_liumengyi_fixbug' into 'master'

* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.

See merge request easycorp/zentaopms!1444

module/execution/control.php

@@ -2415,7 +2415,6 @@ class execution extends control
             $this->executeHooks($executionID);
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-            if($execution->type == 'kanban') return print(js::locate($this->createLink('execution', 'all'), 'parent'));
             return print(js::reload('parent'));
         }
     }

module/execution/js/kanban.js

@@ -249,21 +249,21 @@ if(!window.kanbanDropRules)
         },
         bug:
         {
-            'unconfirmed': ['confirmed', 'fixing', 'fixed'],
-            'confirmed': ['fixing', 'fixed'],
-            'fixing': ['fixed'],
-            'fixed': ['testing', 'tested', 'fixing'],
-            'testing': ['tested', 'closed', 'fixing'],
-            'tested': ['closed', 'fixing'],
-            'closed': ['fixing'],
+            'unconfirmed': ['unconfirmed', 'confirmed', 'fixing', 'fixed'],
+            'confirmed': ['confirmed', 'fixing', 'fixed'],
+            'fixing': ['fixing', 'fixed'],
+            'fixed': ['fixed', 'testing', 'tested', 'fixing'],
+            'testing': ['testing', 'tested', 'closed', 'fixing'],
+            'tested': ['tested', 'closed', 'fixing'],
+            'closed': ['closed', 'fixing'],
         },
         task:
         {
-            'wait': ['wait', 'developing', 'developed', 'canceled', 'closed'],
-            'developing': ['developing', 'developed', 'pause'],
-            'developed': ['developed', 'canceled', 'closed'],
-            'pause': ['pause', 'developing'],
-            'canceled': ['canceled', 'developing'],
+            'wait': ['wait', 'developing', 'developed', 'canceled'],
+            'developing': ['developing', 'developed', 'pause', 'canceled'],
+            'developed': ['developed', 'developing', 'closed'],
+            'pause': ['pause', 'developing', 'developed', 'canceled'],
+            'canceled': ['canceled', 'developing', 'closed'],
             'closed': ['closed', 'developing'],
         }
     }
@@ -294,7 +294,7 @@ function findDropColumns($element, $root)
         var newCol = $newCol.data();
         var newGroupID =  $newCol.closest('.kanban-board').data().id;
 
-        var canDropHere = colRules.indexOf(newCol.type) > -1 && newGroupID.id === groupID.id;
+        var canDropHere = colRules.indexOf(newCol.type) > -1 && newGroupID === groupID;
         if(canDropHere) $newCol.addClass('can-drop-here');
         return canDropHere;
     });

module/project/control.php

@@ -530,6 +530,7 @@ class project extends control
         $project   = $this->project->getByID($projectID);
         $programID = $project->parent;
         $this->project->setMenu($projectID);
+        if($project->model == 'kanban') unset($this->lang->project->authList['reset']);
 
         if($_POST)
         {

module/project/view/index.html.php

@@ -84,13 +84,13 @@
               <div class='kanban-members pull-left'>
                 <?php $count = 0;?>
                 <?php foreach($members as $member):?>
-                <?php if($count > 2) break;?>
+                <?php if($count > 1) break;?>
                 <?php $count ++;?>
                 <div title="<?php echo $member->realname;?>">
                   <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member->account], 'account' => $member->account)); ?>
                 </div>
                 <?php endforeach;?>
-                <?php if(count($members) > 4):?>
+                <?php if(count($members) > 3):?>
                 <?php echo '<span>…</span>';?>
                 <?php $lastMember = end($members);?>
                 <div title="<?php echo $lastMember->realname;?>">

module/story/control.php

@@ -115,8 +115,7 @@ class story extends control
                 }
                 else
                 {
-                    $cell = $this->dao->select('lane,`column`')->from(TABLE_KANBANCELL)->where('type')->eq('story')->andWhere('kanban')->eq($objectID)->fetch();
-                    $this->loadModel('kanban')->addKanbanCell($objectID, $cell->lane, $cell->column, 'story', $storyID);
+                    $this->loadModel('kanban')->updateLane($objectID, 'story');
                 }
             }
             if($storyResult['status'] == 'exists')