From 0be72d5b7cdcb7e0130b034e89408eabad522119 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 25 Mar 2025 02:55:30 +0000
Subject: [PATCH]  * [bug#60783,done,2h] Process space and spaceType in quick
 space.

---
 module/doc/control.php       | 45 ++++++++++++++++++++++++++++++++----
 module/doc/ui/quick.html.php |  1 +
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index f662d3f65a..b1622345ad 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -1511,18 +1511,46 @@ class doc extends control
      * @param  int    $libID
      * @param  string $spaceType
      * @param  string $space
-     * @param  string $locate
      * @access public
      * @return void
      */
-    public function moveDoc(int $docID, int $libID = 0, string $spaceType = '', string $space = '', string $locate = '')
+    public function moveDoc(int $docID, int $libID = 0, string $spaceType = '', string $space = '')
     {
+        if($spaceType == 'quick')
+        {
+            $libID = 0;
+            $space = $spaceType = '';
+        }
+
         $doc = $this->doc->getByID($docID);
         if(empty($libID)) $libID = (int)$doc->lib;
         $lib = $this->doc->getLibByID($libID);
 
-        if(empty($space))     $space = $lib->parent;
-        if(empty($spaceType)) $spaceType = $this->doc->getSpaceType($space);
+        if(empty($space))
+        {
+            if($lib->parent)
+            {
+                $space = $lib->parent;
+            }
+            else
+            {
+                if($lib->product) $space = $lib->product;
+                if($lib->project) $space = $lib->project;
+            }
+        }
+
+        if(empty($spaceType))
+        {
+            if($lib->parent)
+            {
+                $spaceType = $this->doc->getSpaceType($space);
+            }
+            else
+            {
+                if($lib->product && $lib->type == 'product') $spaceType = 'product';
+                if($lib->project && $lib->type == 'project') $spaceType = 'project';
+            }
+        }
 
         if(!empty($_POST))
         {
@@ -1599,6 +1627,13 @@ class doc extends control
         $docIdList = json_decode(base64_decode($encodeDocIdList), true);
         if(!$docIdList) $this->locate($this->createLink('doc', 'app', "type={$type}&spaceID={$spaceID}&libID={$libID}&moduleID={$moduleID}"));
 
+        $spaces = $this->doc->getAllSubSpaces();
+        if($type == 'quick')
+        {
+            list($type, $spaceID) = explode('.', key($spaces));
+            $spaceID = (int) $spaceID;
+        }
+
         if($_POST)
         {
             $oldDocList = $this->doc->getDocsByIdList($docIdList);
@@ -1635,7 +1670,7 @@ class doc extends control
         $this->view->spaceID         = $spaceID;
         $this->view->libID           = $libID;
         $this->view->moduleID        = $moduleID;
-        $this->view->spaces          = $this->doc->getAllSubSpaces();
+        $this->view->spaces          = $spaces;
         $this->view->libPairs        = $libPairs;
         $this->view->optionMenu      = $this->loadModel('tree')->getOptionMenu($libID, 'doc', 0);
         $this->view->groups          = $this->loadModel('group')->getPairs();
diff --git a/module/doc/ui/quick.html.php b/module/doc/ui/quick.html.php
index d59f69d93f..c5f7d5e554 100644
--- a/module/doc/ui/quick.html.php
+++ b/module/doc/ui/quick.html.php
@@ -37,6 +37,7 @@ docApp
     set::docID($docID),
     set::noSpace(),
     set::noModule(),
+    set::spaceType('quick'),
     set::homeName(false),
     set::mode($docID ? 'view' : 'list'),
     set::privs($privs),