From 0c935c7eea0293edd68e6be823ca9826b6854738 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 13 Apr 2023 15:45:51 +0800
Subject: [PATCH] * Modify jump link.

---
 module/action/lang/en.php           | 2 +-
 module/doc/css/tablecontents.css    | 2 +-
 module/doc/view/doclist.html.php    | 2 +-
 module/doc/view/lefttree.html.php   | 3 ++-
 module/doc/view/mydoclist.html.php  | 2 +-
 module/execution/control.php        | 4 ++--
 module/execution/view/view.html.php | 8 ++++----
 module/my/css/doc.css               | 2 ++
 module/product/control.php          | 2 +-
 module/project/config.php           | 4 ++--
 10 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index d874c37d33..6e9e7534b5 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -754,7 +754,7 @@ $lang->action->label->testtask     = 'Request|testtask|view|caseID=%s';
 $lang->action->label->testsuite    = 'Test Suite|testsuite|view|suiteID=%s';
 $lang->action->label->caselib      = 'Case Library|caselib|view|libID=%s';
 $lang->action->label->todo         = 'Todo|todo|view|todoID=%s';
-$lang->action->label->doclib       = 'Doc Library|doc|objectLibs|type=%s&objectID=%s&libID=%s';
+$lang->action->label->doclib       = 'Doc Library|doc|tablecontents|type=%s&objectID=%s&libID=%s';
 $lang->action->label->doc          = 'Doc|doc|view|docID=%s';
 $lang->action->label->user         = 'User|user|view|account=%s';
 $lang->action->label->testreport   = 'Report|testreport|view|report=%s';
diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css
index b7196e25cc..f53186b0c9 100644
--- a/module/doc/css/tablecontents.css
+++ b/module/doc/css/tablecontents.css
@@ -49,7 +49,7 @@ li.drag-shadow ul {display: none!important;}
 .table .c-name > .doc-title {display: inline-block; max-width: calc(100% - 80px); overflow: hidden; background: transparent; padding-right:0px;}
 .table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
 .table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
-.table .c-name > .ajaxCollect {float: right; position: relative; right: 10px; top: 0px;}
+.table .c-name > .ajaxCollect {float: right; position: relative; right: 10px; top: 0px; padding: 0 6px;}
 table.table > thead > tr {height: 32px;}
 
 #bysearchTab::before {display: none;}
diff --git a/module/doc/view/doclist.html.php b/module/doc/view/doclist.html.php
index f6bc1c6b85..7f6e2e26bd 100644
--- a/module/doc/view/doclist.html.php
+++ b/module/doc/view/doclist.html.php
@@ -20,7 +20,7 @@ body {margin-bottom: 25px;}
 #docListForm .checkbox-primary > label {height: 16px; line-height: 16px; padding-left: 16px;}
 #docListForm .checkbox-primary > label:before {left: -1px; font-size: 10px;}
 #docListForm .checkbox-primary > label:after {width: 12px; height: 12px;}
-.table-files .btn {padding: 0 2px;}
+.table-files .btn {padding: 2px;}
 </style>
 <?php if(common::checkNotCN()):?>
 <style>
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index 237b628961..034ef54a9e 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -24,7 +24,8 @@
 .tree-icon {position: absolute; right: 0;}
 .tree li.has-input {overflow: hidden;}
 .tree li.has-input  > input.input-bro {margin-left: 15px;}
-.img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px; margin-bottom: 5px;}
+.img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px; margin-bottom: 2px;}
+.file-icon {width: 14px; margin-bottom: 4px;}
 .tree-icon {position: absolute; right: 0;}
 .tree li > a {max-width: 100%; padding: 2px;}
 .file-tree  a.show-icon > div,
diff --git a/module/doc/view/mydoclist.html.php b/module/doc/view/mydoclist.html.php
index c3072a4f3f..5fd3c59bad 100644
--- a/module/doc/view/mydoclist.html.php
+++ b/module/doc/view/mydoclist.html.php
@@ -19,7 +19,7 @@ body {margin-bottom: 25px;}
 #docListForm .table .c-name > .doc-title {display: inline-block; max-width: calc(100% - 80px); overflow: hidden; background: transparent; padding-right:0px;}
 #docListForm .table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
 #docListForm .table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
-#docListForm .table .c-name > .ajaxCollect {float: right; position: relative; right: 10px; top: 0px;}
+#docListForm .table .c-name > .ajaxCollect {float: right; position: relative; right: 10px; top: 0px; padding: 0 6px;}
 #docListForm table.table > thead > tr {height: 32px;}
 #docListForm .checkbox-primary {line-height: 16px;}
 #docListForm table .checkbox-primary {top: -2px;}
diff --git a/module/execution/control.php b/module/execution/control.php
index 592af73289..e0bd8f5f8e 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1829,7 +1829,7 @@ class execution extends control
 
             if($this->app->tab == 'doc')
             {
-                return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'objectLibs', "type=execution")));
+                return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'projectSpace', "objectID=$executionID")));
             }
 
             if(!empty($projectID) and strpos(',kanban,agileplus,waterfallplus,', ",$project->model,") !== false)
@@ -4183,7 +4183,7 @@ class execution extends control
      */
     public function doc($executionID)
     {
-        $this->locate($this->createLink('doc', 'objectLibs', "type=execution&objectID=$executionID&from=execution"));
+        $this->locate($this->createLink('doc', 'tableContents', "type=execution&objectID=$executionID"));
     }
 
     /**
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index ab8c80b5f7..3b01406422 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -128,15 +128,15 @@
           <div class="panel block-docs" style="height: 240px">
             <div class="panel-heading">
             <div class="panel-title"><?php echo $lang->execution->doclib;?></div>
-              <?php if(common::hasPriv('doc', 'objectLibs')):?>
+              <?php if(common::hasPriv('execution', 'doc')):?>
               <nav class="panel-actions nav nav-default">
-                <li><?php common::printLink('doc', 'objectLibs', "type=execution&executionID=$execution->id&from=execution", strtoupper($lang->more), '', "title=$lang->more");?></li>
+                <li><?php common::printLink('doc', 'tableContents', "type=execution&executionID=$execution->id", strtoupper($lang->more), '', "title=$lang->more");?></li>
               </nav>
               <?php endif;?>
             </div>
             <div class="panel-body">
               <div class="row row-grid">
-                <?php if(common::hasPriv('doc', 'objectLibs')):?>
+                <?php if(common::hasPriv('execution', 'doc')):?>
                 <?php $i = 0;?>
                 <?php foreach($docLibs as $libID => $docLib):?>
                 <?php if($i > 8) break;?>
@@ -144,7 +144,7 @@
                   <?php if($libID == 'files'):?>
                   <?php echo html::a($this->createLink('doc', 'showFiles', "type=execution&objectID=$execution->id"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name);?>
                   <?php else:?>
-                  <?php echo html::a($this->createLink('doc', 'objectLibs', "type=execution&objectID={$execution->id}&libID=$libID"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name, '', "data-app='execution' title='$docLib->name'");?>
+                  <?php echo html::a($this->createLink('doc', 'tableContents', "type=execution&objectID={$execution->id}&libID=$libID"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name, '', "data-app='execution' title='$docLib->name'");?>
                   <?php endif;?>
                 </div>
                 <?php $i++;?>
diff --git a/module/my/css/doc.css b/module/my/css/doc.css
index 93805dfe53..9f54d1f756 100644
--- a/module/my/css/doc.css
+++ b/module/my/css/doc.css
@@ -9,3 +9,5 @@ body {margin-bottom: 25px;}
 #docList.table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
 #docList.table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
 #docList .btn {padding: 0 2px;}
+.btn.ajaxCollect {width: 20px; padding: 0 6px;}
+.btn.ajaxCollect > img {width: 20px;}
diff --git a/module/product/control.php b/module/product/control.php
index 9a1ecb7e49..03f66a8afc 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -415,7 +415,7 @@ class product extends control
             $methodName = $tab == 'program'? 'product' : 'browse';
             $param      = $tab == 'program' ? "programID=$programID" : "productID=$productID";
             $locate     = isonlybody() ? 'parent' : $this->createLink($moduleName, $methodName, $param);
-            if($tab == 'doc') $locate = $this->createLink('doc', 'objectLibs', 'type=product');
+            if($tab == 'doc') $locate = $this->createLink('doc', 'productSpace', "objectID=$productID");
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
diff --git a/module/project/config.php b/module/project/config.php
index d8222aed4f..ad74e87b1b 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -197,7 +197,7 @@ $config->project->noSprintPriv['story']      = array('create', 'batchCreate', 'e
 $config->project->noSprintPriv['bug']        = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
 $config->project->noSprintPriv['testcase']   = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
 $config->project->noSprintPriv['testtask']   = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults');
-$config->project->noSprintPriv['doc']        = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'delete', 'deleteFile', 'allLibs', 'objectLibs', 'collect', 'tableContents', 'showFiles', 'diff', 'manageBook', 'importToPracticeLib', 'importToComponentLib');
+$config->project->includedPriv['doc']        = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'view', 'delete', 'deleteFile', 'collect', 'projectSpace', 'showFiles', 'addCatalog', 'editCatalog', 'deleteCatalog', 'displaySetting', 'diff', 'importToPracticeLib', 'importToComponentLib');
 $config->project->noSprintPriv['repo']       = array('create', 'showSyncCommit', 'browse', 'view', 'diff', 'log', 'revision', 'blame', 'download', 'apiGetRepoByUrl', 'review', 'addBug', 'editBug', 'deleteBug', 'addComment', 'editComment', 'deleteComment');
 $config->project->noSprintPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export');
 $config->project->noSprintPriv['auditplan']  = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo');
@@ -209,7 +209,7 @@ $config->project->includedPriv['story']      = array('create', 'batchCreate', 'e
 $config->project->includedPriv['bug']        = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
 $config->project->includedPriv['testcase']   = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
 $config->project->includedPriv['testtask']   = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults');
-$config->project->includedPriv['doc']        = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'delete', 'deleteFile', 'allLibs', 'objectLibs', 'collect', 'tableContents', 'showFiles', 'diff', 'manageBook', 'importToPracticeLib', 'importToComponentLib');
+$config->project->includedPriv['doc']        = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'view', 'delete', 'deleteFile', 'collect', 'projectSpace', 'showFiles', 'addCatalog', 'editCatalog', 'deleteCatalog', 'displaySetting', 'diff', 'importToPracticeLib', 'importToComponentLib');
 $config->project->includedPriv['repo']       = array('create', 'showSyncCommit', 'browse', 'view', 'diff', 'log', 'revision', 'blame', 'download', 'apiGetRepoByUrl', 'review', 'addBug', 'deleteBug', 'addComment', 'editComment', 'deleteComment');
 $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export');
 $config->project->includedPriv['auditplan']  = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo');