Merge branch 'sprint/187_tianshujie_fixbug' into 'master'

* Finish task #50380.

See merge request easycorp/zentaopms!2143

module/execution/js/kanban.js

@@ -1156,12 +1156,7 @@ function initKanban($kanban)
         onRenderLaneName:  renderLaneName,
         onRenderHeaderCol: renderHeaderCol,
         onRenderCount:     renderCount,
-        droppable:
-        {
-            target:       findDropColumns,
-            finish:       handleFinishDrop,
-            mouseButton: 'left'
-        }
+        droppable:         groupBy == 'default' ? {target: findDropColumns, finish:handleFinishDrop, mouseButton: 'left'} : false,
     });
 
     $kanban.on('click', '.action-cancel', hideKanbanAction);

module/execution/view/all.html.php

@@ -57,7 +57,7 @@
       <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-info'");?>
       <?php else: ?>
       <?php if(common::hasPriv('execution', 'create')):?>
-      <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='$from'");?>
+      <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='execution'");?>
       <?php endif;?>
       <?php endif;?>
     </p>