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

module/program/control.php

@@ -69,7 +69,7 @@ class program extends control
 
     /**
      * Program kanban list.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -79,7 +79,7 @@ class program extends control
         $this->app->session->set('projectList', $this->app->getURI(true), 'project');
 
         $this->view->title       = $this->lang->program->kanban->common;
-        $this->view->kanbanGroup = $this->program->getKanbanGroup();
+        $this->view->kanbanGroup = array_filter($this->program->getKanbanGroup());
         $this->display();
     }
 
@@ -97,7 +97,15 @@ class program extends control
      */
     public function product($programID = 0, $browseType = 'noclosed', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
-        $programID = $this->program->saveState($programID, $this->program->getPairs());
+        $programPairs = $this->program->getPairs();
+
+        if(defined('RUN_MODE') && RUN_MODE == 'api' && !isset($programPairs[$programID]))
+        {
+            return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
+        }
+
+        $programID = $this->program->saveState($programID, $programPairs);
+
         setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
         $this->program->setMenu($programID);

module/program/view/kanban.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/kanban.html.php';?>
 <?php if(empty($kanbanGroup)):?>
 <div class="table-empty-tip cell">
-  <p class="text-muted"><?php echo $lang->noData;?></p>
+  <p class="text-muted"><?php echo $lang->program->noProgram;?></p>
 </div>
 <?php else:?>
 <div id='kanbanList'>