From 14c821a80facb0458cb1fae5cc57d97d3b217d82 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 4 Jan 2024 15:09:48 +0800
Subject: [PATCH] * Fix execution doc view page bug. the bug #43160.

---
 module/doc/control.php       | 6 ++++--
 module/doc/css/create.ui.css | 2 +-
 module/doc/model.php         | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index a11166069e..03ffa55366 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -667,12 +667,14 @@ class doc extends control
         }
 
         $lib = $this->doc->getLibByID((int)$doc->lib);
-        if(!empty($lib) && $lib->deleted == '1') $appendLib = $doc->id;
+        if(!empty($lib) && $lib->deleted == '1') $appendLib = $doc->lib;
+        if($this->app->tab == 'doc' && $lib->type == 'execution') $appendLib = $doc->lib;
+
 
         $objectType = isset($lib->type) ? $lib->type : 'custom';
         $objectID   = zget($doc, $objectType, 0);
         if($objectType == 'custom') $this->lang->doc->menu->custom['alias'] = 'teamspace,view';
-        list($libs, $libID, $object, $objectID, $objectDropdown) = $this->doc->setMenuByType($objectType, $objectID, (int)$doc->lib, $appendLib);
+        list($libs, $libID, $object, $objectID, $objectDropdown) = $this->doc->setMenuByType($objectType, $objectID, (int)$doc->lib, (int)$appendLib);
 
         /* Get doc. */
         if($docID)
diff --git a/module/doc/css/create.ui.css b/module/doc/css/create.ui.css
index 4d8ae0d222..0fff787525 100644
--- a/module/doc/css/create.ui.css
+++ b/module/doc/css/create.ui.css
@@ -2,7 +2,7 @@
 #title {border: unset; font-size: 18px; font-weight: bold; color: #3c4353; padding-left: 16px; --tw-ring-shadow: none}
 #title:focus {box-shadow: none; outline: unset}
 .titleBox{padding: 7px; background: #fff}
-#modalBasicInfo .form-group {margin-top: calc(1rem*(1 - var(--tw-space-y-reverse)));}
+#modalBasicInfo .form-group {margin-top: 0.5rem}
 .form-horz>:not([hidden])~:not([hidden]){margin-top: 0;}
 #whitelistBox .form-group-wrapper+.form-group-wrapper {margin-top: 10px;}
 #titleBox:before {position: absolute; --tw-translate-y: .125rem; --tw-scale-x: 1.25; --tw-scale-y: 1.25; --tw-text-opacity: 1; color: rgba(var(--color-danger-500-rgb),var(--tw-text-opacity)); content: "*"; display: inline-block; margin-left: 0.25rem; transform: translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); }
diff --git a/module/doc/model.php b/module/doc/model.php
index f0d3a78c87..17b68e4a73 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2040,7 +2040,7 @@ class docModel extends model
 
             $this->loadModel($type);
             $objects  = $this->getOrderedObjects($type, 'merge', $objectID);
-            $objectID =  method_exists($this->$type, 'saveState') ? $this->{$type}->saveState($objectID, $objects) : $this->{$type}->checkAccess($objectID, $objects);
+            $objectID = method_exists($this->$type, 'saveState') ? $this->{$type}->saveState($objectID, $objects) : $this->{$type}->checkAccess($objectID, $objects);
             $libs     = $this->getLibsByObject($type, $objectID, $appendLib);
             if(($libID == 0 || !isset($libs[$libID])) && !empty($libs)) $libID = reset($libs)->id;
             if($this->app->tab != 'doc' && isset($libs[$libID]))