* Finish task #9002.

module/group/lang/resource.php

@@ -1311,7 +1311,9 @@ $lang->resource->user->task           = 'task';
 $lang->resource->user->bug            = 'bug';
 $lang->resource->user->testTask       = 'testTask';
 $lang->resource->user->testCase       = 'testCase';
-$lang->resource->user->project        = 'project';
+$lang->resource->user->execution      = 'execution';
+$lang->resource->user->issue          = 'issue';
+$lang->resource->user->risk           = 'risk';
 $lang->resource->user->dynamic        = 'dynamic';
 $lang->resource->user->profile        = 'profile';
 $lang->resource->user->batchEdit      = 'batchEdit';

module/upgrade/model.php

@@ -660,6 +660,11 @@ class upgradeModel extends model
             $this->execSQL($this->getUpgradeFile('20.0.beta2'));
             $this->adjustBudget();
             $this->appendExec('20_0_beta2');
+        case '20_0_beta3':
+            $this->saveLogs('Execute 20_0_beta3');
+            $this->execSQL($this->getUpgradeFile('20.0.beta3'));
+            $this->addPriv20_0_bata3();
+            $this->appendExec('20_0_beta3');
         }
 
         $this->deletePatch();
@@ -4470,4 +4475,34 @@ class upgradeModel extends model
 
         return true;
     }
+
+    public function addPriv20_0_bata3()
+    {
+        $this->saveLogs('Run Method ' . __FUNCTION__);
+        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('user')->andWhere('method')->eq('view')->fetchPairs('group', 'group');
+        foreach($groups as $groupID)
+        {
+            $this->dao->replace(TABLE_GROUPPRIV)
+                ->set('module')->eq('user')
+                ->set('method')->eq('execution')
+                ->set('`group`')->eq($groupID)
+                ->exec();
+            $this->saveLogs($this->dao->get());
+
+            $this->dao->replace(TABLE_GROUPPRIV)
+                ->set('module')->eq('user')
+                ->set('method')->eq('issue')
+                ->set('`group`')->eq($groupID)
+                ->exec();
+            $this->saveLogs($this->dao->get());
+
+            $this->dao->replace(TABLE_GROUPPRIV)
+                ->set('module')->eq('user')
+                ->set('method')->eq('risk')
+                ->set('`group`')->eq($groupID)
+                ->exec();
+            $this->saveLogs($this->dao->get());
+        }
+        return true;
+    }
 }

module/user/lang/de.php

@@ -90,19 +90,20 @@ $lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
 $lang->user->setPublicTemplate     = 'Set as Public Template';
 $lang->user->tplContentNotEmpty    = 'Vorlageninhalt darf nicht leer sein!';
 
-$lang->user->profile  = 'Profil';
-$lang->user->project  = $lang->executionCommon;
-$lang->user->task     = 'Aufgaben';
-$lang->user->bug      = 'Bugs';
-$lang->user->test     = 'Tests';
-$lang->user->testTask = 'Testaufgaben';
-$lang->user->testCase = 'Testfälle';
-$lang->user->issue    = 'Issue';
-$lang->user->risk     = 'Risk';
-$lang->user->schedule = 'Schedule';
-$lang->user->todo     = 'Todos';
-$lang->user->story    = 'Story';
-$lang->user->dynamic  = 'Verlauf';
+$lang->user->profile   = 'Profil';
+$lang->user->project   = $lang->executionCommon;
+$lang->user->execution = 'Execution';
+$lang->user->task      = 'Aufgaben';
+$lang->user->bug       = 'Bugs';
+$lang->user->test      = 'Tests';
+$lang->user->testTask  = 'Testaufgaben';
+$lang->user->testCase  = 'Testfälle';
+$lang->user->issue     = 'Issue';
+$lang->user->risk      = 'Risk';
+$lang->user->schedule  = 'Schedule';
+$lang->user->todo      = 'Todos';
+$lang->user->story     = 'Story';
+$lang->user->dynamic   = 'Verlauf';
 
 $lang->user->openedBy    = 'Geöffnet';
 $lang->user->assignedTo  = 'Zugeordnet';

module/user/lang/en.php

@@ -90,19 +90,20 @@ $lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
 $lang->user->setPublicTemplate     = 'Set as Public Template';
 $lang->user->tplContentNotEmpty    = 'The template content cannot be empty!';
 
-$lang->user->profile  = 'Profile';
-$lang->user->project  = $lang->executionCommon . 's';
-$lang->user->task     = 'Tasks';
-$lang->user->bug      = 'Bugs';
-$lang->user->test     = 'Test';
-$lang->user->testTask = 'Requests';
-$lang->user->testCase = 'Cases';
-$lang->user->issue    = 'Issue';
-$lang->user->risk     = 'Risk';
-$lang->user->schedule = 'Schedule';
-$lang->user->todo     = 'Todos';
-$lang->user->story    = 'Stories';
-$lang->user->dynamic  = 'Dynamics';
+$lang->user->profile   = 'Profile';
+$lang->user->project   = $lang->executionCommon . 's';
+$lang->user->execution = 'Execution';
+$lang->user->task      = 'Tasks';
+$lang->user->bug       = 'Bugs';
+$lang->user->test      = 'Test';
+$lang->user->testTask  = 'Requests';
+$lang->user->testCase  = 'Cases';
+$lang->user->issue     = 'Issue';
+$lang->user->risk      = 'Risk';
+$lang->user->schedule  = 'Schedule';
+$lang->user->todo      = 'Todos';
+$lang->user->story     = 'Stories';
+$lang->user->dynamic   = 'Dynamics';
 
 $lang->user->openedBy    = 'CreatedBy%s';
 $lang->user->assignedTo  = 'AssignedTo%s';

module/user/lang/fr.php

@@ -90,19 +90,20 @@ $lang->user->confirmDeleteTemplate = 'Voulez-vous vraiment supprimer ce modèle
 $lang->user->setPublicTemplate     = 'Définir comme Modèle Public';
 $lang->user->tplContentNotEmpty    = 'Le contenu du modèle ne peut pas être vide !';
 
-$lang->user->profile  = 'Profil';
-$lang->user->project  = $lang->executionCommon . 's';
-$lang->user->task     = 'Tâches';
-$lang->user->bug      = 'Bugs';
-$lang->user->test     = 'Test';
-$lang->user->testTask = 'Recettes';
-$lang->user->testCase = 'CasTests';
-$lang->user->issue    = 'Issue';
-$lang->user->risk     = 'Risk';
-$lang->user->schedule = 'Agenda';
-$lang->user->todo     = 'Todo List';
-$lang->user->story    = 'Stories';
-$lang->user->dynamic  = 'Historique';
+$lang->user->profile   = 'Profil';
+$lang->user->project   = $lang->executionCommon . 's';
+$lang->user->execution = 'Execution';
+$lang->user->task      = 'Tâches';
+$lang->user->bug       = 'Bugs';
+$lang->user->test      = 'Test';
+$lang->user->testTask  = 'Recettes';
+$lang->user->testCase  = 'CasTests';
+$lang->user->issue     = 'Issue';
+$lang->user->risk      = 'Risk';
+$lang->user->schedule  = 'Agenda';
+$lang->user->todo      = 'Todo List';
+$lang->user->story     = 'Stories';
+$lang->user->dynamic   = 'Historique';
 
 $lang->user->openedBy    = 'Créé par %s';
 $lang->user->assignedTo  = 'Assigné à %s';

module/user/lang/vi.php

@@ -90,19 +90,20 @@ $lang->user->confirmDeleteTemplate = 'Bạn có muốn xóa mẫu này?';
 $lang->user->setPublicTemplate     = 'Thiết lập thành mẫu công khai';
 $lang->user->tplContentNotEmpty    = 'Nội dung mẫu này không thể để trống!';
 
-$lang->user->profile  = 'Hồ sơ';
-$lang->user->project  = $lang->executionCommon;
-$lang->user->task     = 'Nhiệm vụ';
-$lang->user->bug      = 'Bugs';
-$lang->user->test     = 'Test';
-$lang->user->testTask = 'Yêu cầu';
-$lang->user->testCase = 'Tình huống';
-$lang->user->issue    = 'Issue';
-$lang->user->risk     = 'Risk';
-$lang->user->schedule = 'Lịch trình';
-$lang->user->todo     = 'Việc làm';
-$lang->user->story    = 'Câu chuyện';
-$lang->user->dynamic  = 'Lịch sử';
+$lang->user->profile   = 'Hồ sơ';
+$lang->user->project   = $lang->executionCommon;
+$lang->user->execution = 'Execution';
+$lang->user->task      = 'Nhiệm vụ';
+$lang->user->bug       = 'Bugs';
+$lang->user->test      = 'Test';
+$lang->user->testTask  = 'Yêu cầu';
+$lang->user->testCase  = 'Tình huống';
+$lang->user->issue     = 'Issue';
+$lang->user->risk      = 'Risk';
+$lang->user->schedule  = 'Lịch trình';
+$lang->user->todo      = 'Việc làm';
+$lang->user->story     = 'Câu chuyện';
+$lang->user->dynamic   = 'Lịch sử';
 
 $lang->user->openedBy   = 'Đã tạo';
 $lang->user->assignedTo = 'Đã nhận';

module/user/lang/zh-cn.php

@@ -90,19 +90,20 @@ $lang->user->confirmDeleteTemplate = '您确认要删除该模板吗？';
 $lang->user->setPublicTemplate     = '设为公共模板';
 $lang->user->tplContentNotEmpty    = '模板内容不能为空!';
 
-$lang->user->profile  = '档案';
-$lang->user->project  = $lang->executionCommon;
-$lang->user->task     = '任务';
-$lang->user->bug      = 'Bug';
-$lang->user->test     = '测试';
-$lang->user->testTask = '测试单';
-$lang->user->testCase = '测试用例';
-$lang->user->issue    = '问题';
-$lang->user->risk     = '风险';
-$lang->user->schedule = '日程';
-$lang->user->todo     = '待办';
-$lang->user->story    = $lang->SRCommon;
-$lang->user->dynamic  = '动态';
+$lang->user->profile   = '档案';
+$lang->user->project   = $lang->executionCommon;
+$lang->user->execution = '执行';
+$lang->user->task      = '任务';
+$lang->user->bug       = 'Bug';
+$lang->user->test      = '测试';
+$lang->user->testTask  = '测试单';
+$lang->user->testCase  = '测试用例';
+$lang->user->issue     = '问题';
+$lang->user->risk      = '风险';
+$lang->user->schedule  = '日程';
+$lang->user->todo      = '待办';
+$lang->user->story     = $lang->SRCommon;
+$lang->user->dynamic   = '动态';
 
 $lang->user->openedBy    = '由%s创建';
 $lang->user->assignedTo  = '指派给%s';

module/user/lang/zh-tw.php

@@ -88,19 +88,20 @@ $lang->user->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 $lang->user->setPublicTemplate     = '設為公共模板';
 $lang->user->tplContentNotEmpty    = '模板內容不能為空!';
 
-$lang->user->profile  = '檔案';
-$lang->user->project  = $lang->executionCommon;
-$lang->user->task     = '任務';
-$lang->user->bug      = 'Bug';
-$lang->user->test     = '測試';
-$lang->user->testTask = '測試單';
-$lang->user->testCase = '測試用例';
-$lang->user->issue    = '問題';
-$lang->user->risk     = '風險';
-$lang->user->schedule = '日程';
-$lang->user->todo     = '待辦';
-$lang->user->story    = $lang->SRCommon;
-$lang->user->dynamic  = '動態';
+$lang->user->profile   = '檔案';
+$lang->user->project   = $lang->executionCommon;
+$lang->user->execution = '執行';
+$lang->user->task      = '任務';
+$lang->user->bug       = 'Bug';
+$lang->user->test      = '測試';
+$lang->user->testTask  = '測試單';
+$lang->user->testCase  = '測試用例';
+$lang->user->issue     = '問題';
+$lang->user->risk      = '風險';
+$lang->user->schedule  = '日程';
+$lang->user->todo      = '待辦';
+$lang->user->story     = $lang->SRCommon;
+$lang->user->dynamic   = '動態';
 
 $lang->user->openedBy    = '由%s創建';
 $lang->user->assignedTo  = '指派給%s';

module/user/view/featurebar.html.php

@@ -40,7 +40,7 @@
     $active = $methodName == 'dynamic' ? ' btn-active-text' : '';
     common::printLink('user', 'dynamic',  "userID={$user->id}&fromModule=$fromModule&type=today", $label, '', "class='btn btn-link $active'");
 
-    $label  = "<span class='text'>{$lang->execution->common}</span>";
+    $label  = "<span class='text'>{$lang->user->execution}</span>";
     $active = $methodName == 'execution' ? ' btn-active-text' : '';
     common::printLink('user', 'execution',  "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");