From 222a718c0ec45dbc6ec097abc2575cf4e59ee0eb Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 20 Apr 2023 09:33:46 +0800
Subject: [PATCH 1/3] * Adjust code for bug #34267 .

---
 module/doc/css/view.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 7319f7e0ea..ad2175a566 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -30,10 +30,9 @@
 .article-content.comment .comment-content {width: 94%;}
 #outlineMenu {max-width: 200px; overflow-x: auto;}
 #outlineMenu .tree li > a {text-overflow: clip;}
-.outline-toggle {position: absolute; right: 20px; top: 50px;}
 .outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
 .outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
-.outline-toggle {position: absolute; right: 55px; top: 50px; background: #fff;}
+.outline-toggle {position: absolute; right: 15px; top: 50px; background: #fff; padding: 5px 20px 5px 15px;}
 .outline ul li {list-style: none;}
 .outline-content {display: none; padding-top: 18px;}
 .outline-content a {color: #838A9D;}

From 5ecfcd3772cb7bda8b13c208163dada6f3d70cbe Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 20 Apr 2023 10:41:42 +0800
Subject: [PATCH 2/3] * Code for task #91380 .

---
 module/doc/view/content.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index 8e2c199373..6b0f4922ed 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -27,7 +27,7 @@
                   <li class="drop-title flex-between dropdown-header not-clear-menu"><div><?php echo $lang->doc->allVersion?></div></li>
                   <div class="drop-body menu-active-primary menu-hover-primary">
                   <?php for($itemVersion = $doc->version; $itemVersion > 0; $itemVersion--):?>
-                    <li class="li-item <?php if($itemVersion == $version) echo 'active';?>"><div class="checkbox-primary"><input type="checkbox" <?php echo "data-id=".$doc->id." data-version=".$itemVersion;?> ></input><label for=""></label></div><a href='javascript:void(0)' data-url='<?php echo $this->createLink('doc', 'view', "docID=$doc->id&version=$itemVersion"); ?>'>#<?php echo $itemVersion;?></a></li>
+                    <li class="li-item <?php if($itemVersion == $version) echo 'active';?>"><div class="checkbox-primary"><input type="checkbox" <?php echo "data-id=".$doc->id." data-version=".$itemVersion;?> ></input><label for=""></label></div><a href='javascript:void(0)' data-url='<?php echo $this->createLink('doc', 'view', "docID=$doc->id&version=$itemVersion"); ?>'>V<?php echo $itemVersion;?></a></li>
                   <?php endfor;?>
                   </div>
                   <li class="drop-bottom"><button data-id="confirm" class="btn btn-primary"><?php echo $lang->confirm?></button><button data-id="cancel" class="btn"><?php echo $lang->doc->cancelDiff?></button></li>

From 66f95eefcaa467386861c6783c9e4be15b46e107 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 20 Apr 2023 13:24:57 +0800
Subject: [PATCH 3/3] * Code for fix bug in change version update .

---
 module/doc/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index 08c3060c94..5008336827 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -1122,7 +1122,7 @@ class doc extends control
      */
     public function view($docID = 0, $version = 0, $appendLib = 0)
     {
-        $doc = $this->doc->getById($docID);
+        $doc = $this->doc->getById($docID, $version, true);
         if(!$this->doc->checkPrivDoc($doc))
         {
             echo(js::alert($this->lang->doc->accessDenied));