Merge branch 'sprint/liumengyi_50321' into 'master'

* Fix bug #50321, #23110, #23109.

See merge request easycorp/zentaopms!3693

module/common/model.php

@@ -1703,8 +1703,8 @@ EOD;
         $executionList  = $app->dbh->query("SELECT id,name,parent FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' AND `deleted` = '0' $userCondition $orderBy")->fetchAll();
         foreach($executionList as $execution)
         {
-            if($execution->id == $executionID) continue;
             if(isset($executionPairs[$execution->parent])) unset($executionPairs[$execution->parent]);
+            if($execution->id == $executionID) continue;
             $executionPairs[$execution->id] = $execution->name;
         }
 

module/execution/js/taskkanban.js

@@ -505,11 +505,11 @@ if(!window.kanbanDropRules)
         },
         task:
         {
-            'wait': ['developing', 'developed', 'canceled', 'closed'],
+            'wait': ['developing', 'developed', 'canceled'],
             'developing': ['developed', 'pause', 'canceled'],
             'developed': ['developing', 'closed'],
             'pause': ['developing'],
-            'canceled': ['developing'],
+            'canceled': ['developing', 'closed'],
             'closed': ['developing'],
         }
     }