* Code for bug #34013, task #90781.

module/block/view/docrecentupdateblock.html.php

@@ -12,7 +12,7 @@
 ?>
 <style>
 .block-docrecentupdate .panel-body {padding: 0px 20px;}
-.block-docrecentupdate .doc-list {display: flex; flex-wrap: wrap; padding: 0 4px 4px 4px;}
+.block-docrecentupdate .doc-list {display: flex; flex-wrap: wrap; padding: 2px 4px 4px 4px;}
 .block-docrecentupdate .doc-list > .doc-item {flex: 1 1 26%; padding: 8px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 10px; margin-bottom: 16px; width: 0px; cursor: pointer;}
 .block-docrecentupdate .doc-list > .doc-item .date-interval {float: right; padding: 8px 0px;}
 .block-docrecentupdate .doc-list > .doc-item .file-icon {float: left; padding: 8px 4px;}
@@ -21,11 +21,16 @@
 
 .block-docrecentupdate.block-sm .doc-list > .doc-item {flex: 1 1 100%;}
 </style>
+<?php $canView = common::hasPriv('doc', 'view');?>
 <div class="panel-body">
   <div class="plug">
     <div class="doc-list">
       <?php foreach($docList as $doc):?>
-      <a class="doc-item shadow-primary-hover" href='<?php echo $this->createLink("doc", "view", "docID=$doc->id");?>'>
+      <?php if($canview):?>
+      <a class="doc-item shadow-primary-hover" href='<?php echo $this->createlink("doc", "view", "docid=$doc->id");?>'>
+      <?php else:?>
+      <div class="doc-item shadow-primary-hover">
+      <?php endif;?>
         <span class='date-interval text-muted'>
           <?php
           $interval = $doc->editInterval;
@@ -51,7 +56,11 @@
         ?>
         <h4 class="plug-title" title="<?php echo $doc->title;?>"><?php echo $doc->title;?></h4>
         <p class='edit-date text-muted'><?php echo $lang->doc->editedDate . (common::checkNotCN() ? ': ' : '：') . $doc->editedDate;?></p>
+      <?php if($canview):?>
       </a>
+      <?php else:?>
+      </div>
+      <?php endif;?>
       <?php endforeach;?>
     </div>
   </div>

module/block/view/docstatisticblock.html.php

@@ -17,18 +17,12 @@
 .block-docstatistic .created {flex: 0 1 48%;}
 .block-docstatistic .edited {flex: 0 1 16%; padding-left: 20px;}
 .block-docstatistic .divider {border-right: 1px solid #eee; padding-right: 12%;}
-.block-docstatistic .title-line {height: 32px;}
-.block-docstatistic .panel-title {display: none;}
-.block-docstatistic .panel-body {margin-top: -32px; padding: 30px;}
-.block-docstatistic .tile-title {white-space: nowrap;}
+.block-docstatistic .panel-body {padding-top: 0;}
 
 .block-docstatistic.block-sm .flex {justify-content: start;}
 .block-docstatistic.block-sm .panel-body.flex {flex-direction: column;}
 .block-docstatistic.block-sm .divider {border-right: none;}
-.block-docstatistic.block-sm .panel-title {display: block;}
-.block-docstatistic.block-sm .statistic .title-line {display: none;}
 .block-docstatistic.block-sm .statistic .flex {margin-top: -28px;}
-.block-docstatistic.block-sm .title-line {height: 0; padding-top: 10px;}
 .block-docstatistic.block-sm .tile {padding: 10px 32px 20px;}
 .block-docstatistic.block-sm .panel-body {margin-top: 0px; padding: 10px;}
 .block-docstatistic.block-sm .flex-column .flex .tile:nth-child(1) {padding-left: 0;}
@@ -39,7 +33,6 @@
 <div class='panel-move-handler'></div>
 <div class="panel-body flex">
   <div class='flex flex-column statistic'>
-    <h4 class="title-line"><?php echo $lang->doc->docStatistic;?></h4>
     <div class='flex'>
       <div class="tile">
         <div class="tile-amount"><?php echo (int)$statistic->totalDocs;?></div>
@@ -52,7 +45,6 @@
     </div>
   </div>
   <div class='flex flex-column created'>
-    <h4 class="title-line"><?php echo $lang->doc->openedByMe;?></h4>
     <div class='flex'>
       <?php if(common::hasPriv('doc', 'mySpace')):?>
       <a class="tile" href="<?php echo $this->createLink('doc', 'mySpace', 'type=createdBy');?>">
@@ -77,7 +69,6 @@
     </div>
   </div>
   <div class='flex flex-column edited'>
-    <h4 class="title-line"><?php echo $lang->doc->editedByMe;?></h4>
     <div class='flex'>
       <div class="tile">
         <div class="tile-amount"><?php echo (int)$statistic->myEditedDocs;?></div>

module/doc/model.php

@@ -2990,6 +2990,7 @@ class docModel extends model
                 $docIDList = $this->getPrivDocs($lib->id);
                 $docs      = $this->dao->select('*, title as name')->from(TABLE_DOC)
                     ->where('id')->in($docIDList)
+                    ->andWhere("(status = 'normal' or (status = 'draft' and addedBy='{$this->app->user->account}'))")
                     ->andWhere('deleted')->eq(0)
                     ->andWhere('module')->eq(0)
                     ->fetchAll('id');