From 92f366b76754b17c57f51a6a9b376c6742dec945 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 6 Feb 2020 09:01:41 +0800
Subject: [PATCH]  * code for task #6849.

---
 config/filter.php           | 4 ++++
 module/caselib/control.php  | 3 ++-
 module/doc/control.php      | 2 +-
 module/testcase/control.php | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index 4699181e44..45e53030de 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -27,6 +27,7 @@ $filter->default->cookie['theme']       = 'reg::word';
 $filter->default->cookie['fingerprint'] = 'reg::word';
 
 $filter->bug        = new stdclass();
+$filter->caselib    = new stdclass();
 $filter->doc        = new stdclass();
 $filter->product    = new stdclass();
 $filter->qa         = new stdclass();
@@ -54,6 +55,7 @@ $filter->bug->browse             = new stdclass();
 $filter->bug->default            = new stdclass();
 $filter->bug->create             = new stdclass();
 $filter->bug->export             = new stdclass();
+$filter->caselib->create         = new stdclass();
 $filter->doc->create             = new stdclass();
 $filter->doc->browse             = new stdclass();
 $filter->doc->showfiles          = new stdclass();
@@ -103,6 +105,8 @@ $filter->bug->create->cookie['preBranch']      = 'int';
 $filter->bug->create->cookie['lastBugModule']  = 'int';
 $filter->bug->export->cookie['checkedItem']    = 'reg::checked';
 
+$filter->caselib->create->cookie['lastLibCaseModule']       = 'int';
+
 $filter->doc->create->cookie['lastDocModule']       = 'int';
 $filter->doc->browse->cookie['browseType']          = 'reg::browseType';
 $filter->doc->alllibs->cookie['browseType']         = 'reg::browseType';
diff --git a/module/caselib/control.php b/module/caselib/control.php
index afa9302736..246bf442d3 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -241,6 +241,7 @@ class caselib extends control
         {
             $this->loadModel('testcase');
             $this->config->testcase->create->requiredFields = $this->config->caselib->createcase->requiredFields;
+            setcookie('lastLibCaseModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
             $caseResult = $this->testcase->create($bugID = 0);
             if(!$caseResult or dao::isError()) die(js::error(dao::getError()));
 
@@ -304,7 +305,7 @@ class caselib extends control
         $this->view->customFields     = $customFields;
         $this->view->libraries        = $libraries;
         $this->view->libID            = $libID;
-        $this->view->currentModuleID  = (int)$moduleID;
+        $this->view->currentModuleID  = $moduleID ? (int)$moduleID : $this->cookie->lastLibCaseModule;
         $this->view->caseTitle        = $caseTitle;
         $this->view->type             = $type;
         $this->view->stage            = $stage;
diff --git a/module/doc/control.php b/module/doc/control.php
index 9c7384542c..7409ee206f 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -367,7 +367,7 @@ class doc extends control
         $this->view->libs             = $this->doc->getLibs($type = 'all', $extra = "withObject,$unclosed", $libID);
         $this->view->libName          = $this->dao->findByID($libID)->from(TABLE_DOCLIB)->fetch('name');
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0);
-        $this->view->moduleID         = $moduleID ? $moduleID : (int)$this->post->lastDocModule;
+        $this->view->moduleID         = $moduleID ? (int)$moduleID : (int)$this->cookie->lastDocModule;
         $this->view->type             = $type;
         $this->view->docType          = $docType;
         $this->view->groups           = $this->loadModel('group')->getPairs();
diff --git a/module/testcase/control.php b/module/testcase/control.php
index cb6bcbc4aa..016903c479 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -341,7 +341,7 @@ class testcase extends control
         $this->view->productID        = $productID;
         $this->view->productName      = $this->products[$productID];
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch);
-        $this->view->currentModuleID  = $currentModuleID ? $currentModuleID : (int)$this->post->lastCaseModule;
+        $this->view->currentModuleID  = $currentModuleID ? $currentModuleID : (int)$this->cookie->lastCaseModule;
         $this->view->stories          = $stories;
         $this->view->caseTitle        = $caseTitle;
         $this->view->color            = $color;