From ddd5818fc15a19b398255d7e959440ffa5a159d2 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 22 Jun 2022 09:10:27 +0000
Subject: [PATCH] fixbug_doc

---
 module/doc/css/objectlibs.css       | 2 +-
 module/doc/js/browse.js             | 4 ----
 module/doc/js/tablecontents.js      | 2 --
 module/doc/model.php                | 5 +----
 module/doc/view/browse.html.php     | 7 ++++---
 module/doc/view/objectlibs.html.php | 1 +
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index 0215993c68..a6377b60a1 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -32,7 +32,7 @@
 
 .article-content {width: 100%; display: inline-block;}
 .outline {position: relative;}
-.outline .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; background: #efefef; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;}
+.outline .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;}
 .outline .outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
 .outline .outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
 .outline ul li {list-style: none;}
diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js
index 65771d2363..7069c7e805 100644
--- a/module/doc/js/browse.js
+++ b/module/doc/js/browse.js
@@ -5,7 +5,3 @@ $('.ajaxCollect').click(function()
         window.location.reload();
     }
 })
-$(function()
-{
-    $('#pageActions .btn-toolbar').prepend("<a class='btn btn-link querybox-toggle querybox-opened' id='bysearchTab'><i class='icon icon-search muted'></i>" + docLang.search + "</a>");
-});
diff --git a/module/doc/js/tablecontents.js b/module/doc/js/tablecontents.js
index 0e2a340b24..09bb656611 100644
--- a/module/doc/js/tablecontents.js
+++ b/module/doc/js/tablecontents.js
@@ -19,8 +19,6 @@ $(function()
 
     $('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
 
-    $('#pageActions .btn-toolbar').prepend("<a class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'></i>" + docLang.search + "</a>");
-
    /* Make modules tree sortable. */
    $('#modules').sortable(
    {
diff --git a/module/doc/model.php b/module/doc/model.php
index b9015e4f75..cb19722a7d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2159,10 +2159,7 @@ class docModel extends model
             $html .= html::submitButton("<i class='icon icon-search'></i>", '', "btn  btn-icon btn-link input-control-icon-right");
             $html .= '</form></div>';
         }
-        else
-        {
-            $html  = '';
-        }
+        $html  = '<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i>' . $this->lang->doc->search . '</a>';
         $html .= "<div class='btn-group dropdown-hover'>";
         $html .= "<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'>{$this->lang->doc->myCollection}</a>";
         $html .= "<ul class='dropdown-menu pull-right' id='collection-menu'>";
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index deb343f017..369890c216 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -65,9 +65,10 @@
                 ?>
               </td>
               <?php else:?>
-              <?php if(common::hasPriv('doc', 'view')):?>
-              <td class="c-id"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0", '', true), $doc->id, '', "title='{$doc->id}' class='iframe' data-width='90%'");?></td>
-              <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0", '', true), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title='{$doc->title}' class='iframe' data-width='90%'");?></td>
+              <?php if(common::hasPriv('doc', 'objectLibs')):?>
+              <?php $objectID = $doc->{$type};?>
+              <td class="c-id"><?php echo html::a($this->createLink('doc', 'objectLibs', "type=$type&objectID=$objectID&libID=$doc->lib&docID=$doc->id"), $doc->id, '', "title='{$doc->id}' data-app='{$this->app->tab}'");?></td>
+              <td class="c-name"><?php echo html::a($this->createLink('doc', 'objectLibs', "type=$type&objectID=$objectID&libID=$doc->lib&docID=$doc->id"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title='{$doc->title}' data-app='{$this->app->tab}'");?></td>
               <?php else:?>
               <td class='c-id' title='<?php echo $doc->id;?>'><?php echo "<i class='icon icon-file-text text-muted'></i> {$doc->id}";?></td>
               <td class='c-name' title='<?php echo $doc->title;?>'><?php echo "<i class='icon icon-file-text text-muted'></i> {$doc->title}";?></td>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 2a0be66c0e..cd6df9b47c 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -14,6 +14,7 @@
 <?php if($app->tab == 'execution'):;?>
 <style>.panel-body{min-height: 180px}</style>
 <?php endif;?>
+<div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo $type . 'Doc';?>></div>
 <div class="fade main-row split-row" id="mainRow">
   <?php if($libID):?>
     <?php include './side.html.php';?>