Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'dev/gfl_fixbug' into 'master'

Browse Source 
Dev/gfl fixbug

See merge request easycorp/zentaopms!7500
This commit is contained in:
王怡栋
2023-04-20 05:26:16 +00:00
parent 8e7db6d8ec 66f95eefca
commit fd62ec24c3
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+1 -1
View File
@@ -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));
module/doc/css/view.css
+1 -2
View File
@@ -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;}
module/doc/view/content.html.php
+1 -1
View File
@@ -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>