Merge branch 'cyy_fixbug' into 'master'

* Add collections for doc view.

See merge request easycorp/zentaopms!7424

module/doc/css/view.css

@@ -25,6 +25,7 @@
 .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 {width: 100%; display: inline-block;}
+.article-content img {margin: 0;}
 .article-content.comment .comment-content {width: 94%;}
 #outlineMenu {max-width: 200px;}
 #outlineMenu .tree li > a {text-overflow: clip;}

module/doc/model.php

@@ -3323,7 +3323,7 @@ class docModel extends model
         $actionGroup = $this->dao->select('*')->from(TABLE_DOCACTION)->where('doc')->in(array_keys($docs))->andWhere('action')->eq('collect')->fetchGroup('doc', 'actor');
         foreach($docs as $docID => $doc)
         {
-            $doc->collector = '';
+            $doc->collector   = '';
             if(isset($actionGroup[$docID])) $doc->collector = ',' . implode(',', array_keys($actionGroup[$docID])) . ',';
         }
         return $docs;

module/doc/view/content.html.php

@@ -74,7 +74,9 @@
           <div class="detail-content article-content table-col">
             <div class='info'>
               <span class='user-time text-muted'><i class='icon icon-contacts'></i> <?php echo zget($users, $doc->addedBy) . " {$lang->colon} " . substr($doc->addedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->createAB;?></span>
-              <span class='user-time text-muted'><i class='icon icon-eye'></i> <?php echo $doc->views;?></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-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):?>
               <span class='keywords'>
                 <?php foreach($doc->keywords as $keywords):?>