From 3c76af4cb8895049f684626f282c4bb13b3a1e15 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 29 Mar 2023 14:31:35 +0800
Subject: [PATCH] * Code for task #89151.

---
 module/doc/control.php             | 16 +++++++---------
 module/doc/view/createlib.html.php |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index ce25358ea5..99717a85e6 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -1024,13 +1024,12 @@ class doc extends control
      */
     public function showFiles($type, $objectID, $viewType = '', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $searchTitle = '')
     {
-        if(empty($viewType)) $viewType = !empty($_COOKIE['docFilesViewType']) ? $this->cookie->docFilesViewType : 'card';
+        if(empty($viewType)) $viewType = !empty($_COOKIE['docFilesViewType']) ? $this->cookie->docFilesViewType : 'list';
         setcookie('docFilesViewType', $viewType, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
-        $objects                   = $this->doc->getOrderedObjects($type);
-        $objectID                  = $this->{$type}->saveState($objectID, $objects);
-        $libs                      = $this->doc->getLibsByObject($type, $objectID);
-        $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs);
+        $objects  = $this->doc->getOrderedObjects($type);
+        $objectID = $this->{$type}->saveState($objectID, $objects);
+        $libs     = $this->doc->getLibsByObject($type, $objectID);
 
         $tab = strpos('doc,product,project,execution', $this->app->tab) !== false ? $this->app->tab : 'doc';
         if($tab != 'doc') $this->loadModel($tab)->setMenu($objectID);
@@ -1041,13 +1040,11 @@ class doc extends control
         if(!empty($_POST)) $searchTitle = $this->post->title;
         if(empty($_POST) and !empty($searchTitle)) $this->post->title = $searchTitle;
 
-        $this->lang->TRActions = $this->doc->buildBrowseSwitch($type, $objectID, $viewType, $orderBy, $recTotal, $recPerPage, $pageID, $searchTitle);
-
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $files = $this->doc->getLibFiles($type, $objectID, $orderBy, $pager);
+        $files   = $this->doc->getLibFiles($type, $objectID, $orderBy, $pager);
 
         $this->view->title      = $object->name;
         $this->view->position[] = $object->name;
@@ -1064,6 +1061,7 @@ class doc extends control
         $this->view->summary      = $this->doc->summary($files);
         $this->view->sourcePairs  = $this->doc->getFileSourcePairs($files);
         $this->view->fileIcon     = $this->doc->getFileIcon($files);
+        $this->view->libTree      = $this->doc->getLibTree(0, $libs, $type, 0, $objectID);
 
         $this->display();
     }
@@ -1446,6 +1444,6 @@ class doc extends control
 
         $project  = $this->project->getById($projectID);
         $disabled = $project->multiple ? '' : 'disabled';
-        return print(html::select('execution', $executionPairs, 0, "class='form-control' data-placeholder='{$this->lang->doclib->tip->selectExecution}' $disabled"));
+        return print(html::select('execution', $executionPairs, 0, "class='form-control' data-placeholder='{$this->lang->doclib->tip->selectExecution}' $disabled data-drop_direction='down' data-dropDirection='down'"));
     }
 }
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 4ab6346089..5db488507c 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -25,14 +25,14 @@
             <?php if(in_array($type, array('product', 'project', 'execution'))):?>
             <tr class='objectBox'>
               <th><?php echo $lang->doc->{$type}?></th>
-              <td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control chosen' data-dropDirection='down'")?></td>
+              <td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control chosen' data-dropDirection='down' data-drop_direction='down'")?></td>
             </tr>
             <?php if($app->tab == 'doc' and $type == 'project'):?>
             <tr class='executionBox'>
               <th><?php echo $lang->doc->execution?></th>
               <td>
                 <?php $disabled = $project->multiple ? '' : 'disabled';?>
-                <?php echo html::select('execution', $executionPairs, 0, "class='form-control chosen' data-drop_direction='down' data-placeholder='{$lang->doclib->tip->selectExecution}' $disabled")?>
+                <?php echo html::select('execution', $executionPairs, 0, "class='form-control chosen' data-drop_direction='down' data-dropDirection='down' data-placeholder='{$lang->doclib->tip->selectExecution}' $disabled")?>
               </td>
             </tr>
             <?php endif;?>