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

module/execution/control.php

@@ -41,7 +41,7 @@ class execution extends control
         $this->loadModel('project');
 
         $this->executions = $this->execution->getPairs(0, 'all', 'nocode');
-        if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu')) and $this->app->openApp == 'execution')
+        if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu', 'executionkanban')) and $this->app->openApp == 'execution')
         {
             if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create'));
         }

module/execution/view/executionkanban.html.php

@@ -10,6 +10,13 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id="kanban" class="main-table fade auto-fade-in" data-ride="table" data-checkable="false" data-group="true">
+  <?php if(empty($kanbanGroup)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->execution->noExecutions;?></span>
+    </p>
+  </div>
+  <?php else:?>
   <table class="table no-margin table-grouped text-center">
     <thead>
       <tr>
@@ -77,6 +84,7 @@
       <?php endforeach;?>
     </tbody>
   </table>
+  <?php endif;?>
 </div>
 <style>
 <?php foreach(array_keys($lang->execution->kanbanColType) as $status):?>