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

module/my/control.php

@@ -402,6 +402,7 @@ class my extends control
         {
             $uri = $this->app->getURI(true);
             $this->session->set('testtaskList', $uri, 'qa');
+            $this->session->set('reportList',   $uri, 'qa');
             $this->session->set('buildList',    $uri, 'execution');
         }
 

module/program/control.php

@@ -70,6 +70,7 @@ class program extends control
     public function kanban()
     {
         $this->app->loadLang('release');
+        $this->app->session->set('projectList', $this->app->getURI(true), 'project');
 
         $this->view->title       = $this->lang->program->kanban->common;
         $this->view->kanbanGroup = $this->program->getKanbanGroup();

module/testreport/control.php

@@ -89,7 +89,6 @@ class testreport extends control
     public function browse($objectID = 0, $objectType = 'product', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if(strpos('product|execution|project', $objectType) === false) die('Type Error!');
-        $this->session->set('reportList', $this->app->getURI(true), $this->app->openApp);
 
         $objectID = $this->commonAction($objectID, $objectType);
         $object   = $this->$objectType->getById($objectID);
@@ -127,6 +126,8 @@ class testreport extends control
             if($param) $this->locate($this->createLink('testreport', 'create', $param));
         }
 
+        $this->session->set('reportList', $this->app->getURI(true), $this->app->openApp);
+
         $executions = array();
         $tasks      = array();
         foreach($reports as $report)