From e5bcb8b2f91bd096f6b5bc22ff3cdcf511a81c99 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 13 Apr 2023 16:58:25 +0800
Subject: [PATCH] * The ID of the last accessed object is retained.

---
 config/filter.php      | 11 +++++------
 module/doc/control.php |  6 ++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index 48a7117eef..91f3e7d0ae 100755
--- a/config/filter.php
+++ b/config/filter.php
@@ -87,8 +87,7 @@ $filter->bug->export              = new stdclass();
 $filter->caselib->create          = new stdclass();
 $filter->doc->create              = new stdclass();
 $filter->doc->browse              = new stdclass();
-$filter->doc->alllibs             = new stdclass();
-$filter->doc->objectlibs          = new stdclass();
+$filter->doc->view                = new stdclass();
 $filter->doc->tablecontents       = new stdclass();
 $filter->doc->productspace        = new stdclass();
 $filter->doc->projectspace        = new stdclass();
@@ -219,12 +218,12 @@ $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';
-$filter->doc->objectlibs->cookie['browseType']              = 'reg::browseType';
-$filter->doc->objectlibs->cookie['preProductID']            = 'int';
-$filter->doc->objectlibs->cookie['preBranch']               = 'reg::word';
+$filter->doc->view->cookie['browseType']                    = 'reg::browseType';
+$filter->doc->view->cookie['preBranch']                     = 'reg::word';
 $filter->doc->default->cookie['from']                       = 'code';
 $filter->doc->default->cookie['product']                    = 'int';
+$filter->doc->default->cookie['preProductID']               = 'int';
+$filter->doc->default->cookie['lastProject']                = 'int';
 $filter->doc->showfiles->cookie['docFilesViewType']         = 'code';
 $filter->doc->tablecontents->cookie['preProductID']         = 'int';
 $filter->doc->tablecontents->cookie['preBranch']            = 'reg::word';
diff --git a/module/doc/control.php b/module/doc/control.php
index 76e954e343..cd9bd12ce1 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -1361,6 +1361,9 @@ class doc extends control
      */
     public function productSpace($objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $products = $this->product->getPairs('nocode', 0, '', 'all');
+        $objectID = $this->product->saveState($objectID, $products);
+
         echo $this->fetch('doc', 'tableContents', "type=product&objectID=$objectID&libID=$libID&moduleID=$moduleID&browseType=$browseType&orderBy=$orderBy&param=$param&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
@@ -1381,6 +1384,9 @@ class doc extends control
      */
     public function projectSpace($objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $projects = $this->project->getPairsByProgram();
+        $objectID = $this->project->saveState($objectID, $projects);
+
         echo $this->fetch('doc', 'tableContents', "type=project&objectID=$objectID&libID=$libID&moduleID=$moduleID&browseType=$browseType&orderBy=$orderBy&param=$param&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }