Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'

* Fix bug #20329,20350,20366.

See merge request easycorp/zentaopms!2123

extension/lite/group/ext/lang/resource.php

@@ -636,6 +636,7 @@ $lang->resource->custom->editStoryConcept   = 'editStoryConcept';
 $lang->resource->custom->browseStoryConcept = 'browseStoryConcept';
 $lang->resource->custom->setDefaultConcept  = 'setDefaultConcept';
 $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
+if($config->edition != 'open') $lang->resource->custom->libreoffice = 'libreOffice';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
@@ -651,6 +652,7 @@ $lang->custom->methodOrder[55] = 'editStoryConcept';
 $lang->custom->methodOrder[60] = 'browseStoryConcept';
 $lang->custom->methodOrder[65] = 'setDefaultConcept';
 $lang->custom->methodOrder[70] = 'deleteStoryConcept';
+$lang->custom->methodOrder[75] = 'libreoffice';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';

module/bug/control.php

@@ -1241,7 +1241,7 @@ class bug extends control
         }
         else
         {
-            $users = $this->user->getPairs('noclosed|nofeedback', $bug->assignedTo);
+            $users = $this->user->getPairs('noclosed', $bug->assignedTo);
         }
 
         $this->view->title      = $this->products[$bug->product] . $this->lang->colon . $this->lang->bug->assignedTo;

module/doc/lang/zh-cn.php

@@ -194,7 +194,7 @@ $lang->doc->noArticle            = '暂时没有文章。';
 $lang->doc->noLib                = '暂时没有文档库。';
 $lang->doc->noBook               = 'WIKI库还未创建手册，请新建 ：）';
 $lang->doc->cannotCreateOffice   = '<p>对不起，企业版才能创建%s文档。<p><p>试用企业版，请联系我们：4006-8899-23 &nbsp; 0532-86893032。</p>';
-$lang->doc->notSetOffice         = "<p>创建%s文档，需要配置<a href='%s'>Office转换设置</a>。<p>";
+$lang->doc->notSetOffice         = "创建%s文档，需要配置<a href='%s'>Office转换设置</a>。";
 $lang->doc->noSearchedDoc        = '没有搜索到任何文档。';
 $lang->doc->noEditedDoc          = '您还没有编辑任何文档。';
 $lang->doc->noOpenedDoc          = '您还没有创建任何文档。';

module/doc/view/create.html.php

@@ -19,7 +19,16 @@
     </div>
     <?php if($this->config->edition != 'open'):?>
     <div class='alert alert-warning strong'>
-      <?php printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');?>
+      <?php
+      if(common::hasPriv('custom', 'libreoffice'))
+      {
+          printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), $this->createLink('custom', 'libreoffice', 'onlybody=yes'));
+      }
+      else
+      {
+          printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), '###'); echo $lang->doc->accessDenied;
+      }
+      ?>
     </div>
     <?php else:?>
     <div class='alert alert-warning strong'><?php printf($lang->doc->cannotCreateOffice, zget($lang->doc->typeList, $docType));?></div>

module/execution/control.php

@@ -2622,7 +2622,7 @@ class execution extends control
         $this->loadModel('dept');
 
         $execution   = $this->execution->getById($executionID);
-        $users     = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount);
+        $users     = $this->user->getPairs('noclosed|nodeleted|devfirst', '', $this->config->maxCount);
         $roles     = $this->user->getUserRoles(array_keys($users));
         $deptUsers = empty($dept) ? array() : $this->dept->getDeptUserPairs($dept);
 
@@ -2637,7 +2637,7 @@ class execution extends control
         foreach($members2Import as $member) $appendUsers[$member->account] = $member->account;
         foreach($deptUsers as $deptAccount => $userName) $appendUsers[$deptAccount] = $deptAccount;
 
-        $users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', $appendUsers, $this->config->maxCount);
+        $users = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendUsers, $this->config->maxCount);
         $roles = $this->user->getUserRoles(array_keys($users));
 
         /* Set menu. */

module/project/control.php

@@ -1349,7 +1349,7 @@ class project extends control
         }
 
         $project      = $this->project->getById($projectID);
-        $users        = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback');
+        $users        = $this->user->getPairs('noclosed|nodeleted|devfirst');
         $roles        = $this->user->getUserRoles(array_keys($users));
         $deptUsers    = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
         $userInfoList = $this->user->getUserDisplayInfos(array_keys($users), $dept);

module/search/model.php

@@ -706,7 +706,7 @@ class searchModel extends model
         $index->title      = $object->{$fields->title};
         $index->addedDate  = isset($object->{$fields->addedDate}) ? $object->{$fields->addedDate} : '0000-00-00 00:00:00';
         $index->editedDate = isset($object->{$fields->editedDate}) ? $object->{$fields->editedDate} : '0000-00-00 00:00:00';
-        $index->vision     = $this->config->vision;
+        $index->vision     = isset($object->vision) ? $object->vision : 'rnd';
 
         $index->content = '';
         $contentFields  = explode(',', $fields->content . ',comment');