From 2a17dbd38294ca73a996d55a55c972a9ef6f9c4e Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 20 Mar 2025 07:39:00 +0000
Subject: [PATCH]  * [bug#60695,done,1h] Add read list box for uploading
 documents.

---
 module/doc/js/common.ui.js        |  2 +-
 module/doc/js/uploaddocs.ui.js    |  1 -
 module/doc/ui/uploaddocs.html.php | 40 +++++++++++++------------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/module/doc/js/common.ui.js b/module/doc/js/common.ui.js
index e017027070..ebc6663107 100644
--- a/module/doc/js/common.ui.js
+++ b/module/doc/js/common.ui.js
@@ -48,7 +48,7 @@ function toggleAcl(type)
     }
     else if(type == 'doc')
     {
-        $('#whiteListBox').toggleClass('hidden', acl == 'open');
+        $('#whiteListBox, #readListBox').toggleClass('hidden', acl == 'open');
         $('#groupBox').toggleClass('hidden', acl == 'open');
         loadWhitelist(libID);
     }
diff --git a/module/doc/js/uploaddocs.ui.js b/module/doc/js/uploaddocs.ui.js
index f8cb1cc191..ad4bbdf4ef 100644
--- a/module/doc/js/uploaddocs.ui.js
+++ b/module/doc/js/uploaddocs.ui.js
@@ -54,7 +54,6 @@ window.toggleDocTitle = function()
     $('.titleBox').toggleClass('hidden', uploadFormat != 'combinedDocs');
 }
 
-
 window.titleChanged = function()
 {
     if(observer) observer.disconnect();
diff --git a/module/doc/ui/uploaddocs.html.php b/module/doc/ui/uploaddocs.html.php
index fa90bbc487..f2373e32be 100644
--- a/module/doc/ui/uploaddocs.html.php
+++ b/module/doc/ui/uploaddocs.html.php
@@ -128,35 +128,29 @@ formPanel
             )
         )
     ),
-    formRow
+    formGroup
     (
         setID('whiteListBox'),
         setClass('hidden'),
-        formGroup
+        set::label($lang->doc->whiteList),
+        div
         (
-            set::label($lang->doc->whiteList),
+            setClass('w-full check-list'),
+            inputGroup
+            (
+                setClass('w-full'),
+                $lang->doclib->group,
+                picker
+                (
+                    set::name('groups[]'),
+                    set::items($groups),
+                    set::multiple(true)
+                )
+            ),
             div
             (
-                setClass('w-full check-list'),
-                div
-                (
-                    setClass('w-full'),
-                    inputGroup
-                    (
-                        $lang->doclib->group,
-                        picker
-                        (
-                            set::name('groups[]'),
-                            set::items($groups),
-                            set::multiple(true)
-                        )
-                    )
-                ),
-                div
-                (
-                    setClass('w-full'),
-                    userPicker(set::label($lang->doclib->user), set::items($users))
-                )
+                setClass('w-full'),
+                userPicker(set::label($lang->doclib->user), set::items($users))
             )
         )
     ),