Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/action/lang/zh-tw.php

@@ -477,7 +477,7 @@ $lang->action->label->testtask    = '測試單|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '測試套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '用例庫|caselib|view|libID=%s';
 $lang->action->label->todo        = '待辦|todo|view|todoID=%s';
-$lang->action->label->doclib      = '文檔庫|doc|objectLibs|type=&objectID=&libID=%s';
+$lang->action->label->doclib      = '文檔庫|doc|objectLibs|type=%s&objectID=%s&libID=%s&docID=&version=&appendLib=%s';
 $lang->action->label->doc         = '文檔|doc|view|docID=%s';
 $lang->action->label->user        = '用戶|user|view|account=%s';
 $lang->action->label->testreport  = '報告|testreport|view|report=%s';

module/doc/model.php

@@ -1791,12 +1791,11 @@ class docModel extends model
         foreach($docs as $doc)
         {
             $objectID = 0;
-            if($doc->type == 'product') $objectID = $doc->product;
-            if($doc->type == 'project' or $doc->type == 'execution') $objectID = $doc->project;
+            if($doc->type == 'product')   $objectID = $doc->product;
+            if($doc->type == 'project')   $objectID = $doc->project;
+            if($doc->type == 'execution') $objectID = $doc->execution;
 
-            $docType = ($doc->type == 'execution') ? 'project' : $doc->type;
-
-            $html   .= '<li>' . html::a(inlink('objectLibs', "type={$docType}&objectID=$objectID&libID={$doc->lib}&docID={$doc->id}"), "<i class='icon icon-file-text'></i> " . $doc->title, '', "data-app='doc' title='{$doc->title}'") . '</li>';
+            $html .= '<li>' . html::a(inlink('objectLibs', "type={$doc->type}&objectID=$objectID&libID={$doc->lib}&docID={$doc->id}"), "<i class='icon icon-file-text'></i> " . $doc->title, '', "data-app='doc' title='{$doc->title}'") . '</li>';
         }
 
         $collectionCount = $this->dao->select('count(id) as count')->from(TABLE_DOC)

module/execution/lang/en.php

@@ -54,6 +54,7 @@ $lang->execution->RD              = 'Release Manager';
 $lang->execution->release         = 'Release';
 $lang->execution->acl             = 'Access Control';
 $lang->execution->teamname        = 'Team Name';
+$lang->execution->updateOrder     = 'Rank';
 $lang->execution->order           = "Rank {$lang->executionCommon}";
 $lang->execution->orderAB         = "Rank";
 $lang->execution->products        = "Link {$lang->productCommon}";

module/execution/lang/zh-cn.php

@@ -54,6 +54,7 @@ $lang->execution->RD              = '发布负责人';
 $lang->execution->release         = '发布';
 $lang->execution->acl             = '访问控制';
 $lang->execution->teamname        = '团队名称';
+$lang->execution->updateOrder     = '排序';
 $lang->execution->order           = $lang->executionCommon . '排序';
 $lang->execution->orderAB         = '排序';
 $lang->execution->products        = '相关' . $lang->productCommon;

module/execution/lang/zh-tw.php

@@ -54,6 +54,7 @@ $lang->execution->RD              = '發佈負責人';
 $lang->execution->release         = '發佈';
 $lang->execution->acl             = '訪問控制';
 $lang->execution->teamname        = '團隊名稱';
+$lang->execution->updateOrder     = '排序';
 $lang->execution->order           = $lang->executionCommon . '排序';
 $lang->execution->orderAB         = '排序';
 $lang->execution->products        = '相關' . $lang->productCommon;

module/upgrade/model.php

@@ -694,6 +694,7 @@ class upgradeModel extends model
             $this->processGitlabRepo();
             $this->processStoryFileType();
             $this->processProductDoc();
+            $this->adjustPriv15_3();
             $this->appendExec('15_2');
         }
 
@@ -5197,4 +5198,30 @@ class upgradeModel extends model
 
         return true;
     }
+
+    /**
+     * Adjust priv 15.3
+     *
+     * @access public
+     * @return bool
+     */
+    public function adjustPriv15_3()
+    {
+        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('view')->fetchPairs('group', 'group');
+        foreach($groups as $groupID)
+        {
+            $groupPriv = new stdclass();
+            $groupPriv->group  = $groupID;
+            $groupPriv->module = 'doc';
+            $groupPriv->method = 'objectlibs';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+
+            $groupPriv->method = 'tablecontents';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+
+            $groupPriv->method = 'showfiles';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+        }
+        return true;
+    }
 }