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

Merge branch 'cyy_fixbug' into 'master'

Browse Source 
* Fix bug #34293,34299.

See merge request easycorp/zentaopms!7444
This commit is contained in:
王怡栋
2023-04-18 02:41:20 +00:00
parent 46aea7bf9e 8e69054983
commit 29f2ba65e3
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/view.css
+3 -1
View File
@@ -22,7 +22,7 @@
.article-content {margin-top: 0px}
.article-content .info {margin-bottom: 15px; width:100%; overflow:hidden;}
.article-content .info .user-time{margin-right: 4px}
.article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;}
.article-content .info .keywords .label {padding: 2px 8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height: 18px; line-height:14px; margin-right:4px;}
.article-content {width: 100%; display: inline-block;}
.article-content img {margin: 0;}
@@ -96,3 +96,5 @@
#docVersionMenu.diff > .drop-title > #changeBtn {opacity: 0;}
#docVersionMenu.diff > .drop-bottom > button {display: unset!important;}
.user-time .icon-star {font-size: 12px; line-height: 1.8;}
.user-time .icon-star:before {vertical-align: top;}
module/doc/model.php
+7 -2
View File
@@ -665,7 +665,7 @@ class docModel extends model
{
$editDocs = $this->dao->select('objectID')->from(TABLE_ACTION)
->where('objectType')->eq('doc')
->andWhere('action')->eq('edited')
->andWhere('action')->in('edited,saveddraft')
->andWhere('actor')->eq($this->app->user->account)
->andWhere('vision')->eq($this->config->vision)
->fetchPairs();
@@ -679,7 +679,7 @@ class docModel extends model
->andWhere('t1.lib')->ne('')
->andWhere('t1.id')->in($docIDList)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.addedBy')->eq($this->app->user->account)
->beginIF($type == 'createdby')->andWhere('t1.addedBy')->eq($this->app->user->account)->fi()
->beginIF(!common::hasPriv('doc', 'productSpace'))->andWhere('t2.type')->ne('product')->fi()
->beginIF(!common::hasPriv('doc', 'projectSpace'))->andWhere('t2.type')->notIN('project,execution')->fi()
->beginIF(!common::hasPriv('doc', 'teamSpace'))->andWhere('t2.type')->ne('custom')->fi()
@@ -3276,6 +3276,11 @@ class docModel extends model
if(empty($account))$account = $this->app->user->account;
if($action == 'collect') $this->dao->delete()->from(TABLE_DOCACTION)->where('doc')->eq($docID)->andWhere('action')->eq('collect')->andWhere('actor')->eq($account)->exec();
if($action == 'view')
{
$lastView = $this->dao->select('date')->from(TABLE_DOCACTION)->where('doc')->eq($docID)->andWhere('action')->eq('view')->andWhere('actor')->eq($account)->orderBy('id_desc')->fetch('date');
if($lastView and (time() - strtotime($lastView) < 4)) return false;
}
$data = new stdclass();
$data->doc = $docID;
$data->action = $action;
module/doc/view/content.html.php
+1 -2
View File
@@ -108,8 +108,7 @@
<div class="detail-content article-content table-col">
<div class='info'>
<?php $createInfo = $doc->status == 'draft' ? zget($users, $doc->addedBy) . " {$lang->colon} " . substr($doc->addedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->createAB : zget($users, $doc->releasedBy) . " {$lang->colon} " . substr($doc->releasedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->release;?>
<span class='user-time text-muted'><i class='icon icon-contacts'></i> <?php echo $createInfo;?></span>
<!-- <span data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='user-time ajaxCollect text-muted'><?php echo html::image("static/svg/{$star}.svg", "class='$star'");?> <?php echo $doc->collects;?></span> -->
<span class='user-time text-muted'><i class='icon-contacts'></i> <?php echo $createInfo;?></span>
<span class='user-time text-muted'><i class='icon-star'></i> <?php echo $doc->collects;?></span>
<span class='user-time text-muted'><i class='icon-eye'></i> <?php echo $doc->views;?></span>
<?php if($doc->keywords):?>