Merge branch 'devops24_51105' into 'devops24'

Finish task#51105,51102，51106

See merge request easycorp/zentaopms!2369

module/action/lang/en.php

@@ -644,7 +644,7 @@ $lang->action->label->kanbancolumn = 'Kanban Column|execution|kanban|execution=%
 $lang->action->label->kanbanlane   = 'Kanban Lane|execution|kanban|execution=%s&type=all';
 $lang->action->label->kanbancard   = 'Kanban Card|kanban|view|kanbanID=%s';
 $lang->action->label->mr           = 'Merge Request|mr|view|id=%s';
-$lang->action->label->gitlab       = 'GitLab|gitlab|view|id=%s';
+$lang->action->label->gitlab       = 'GitLab Server|gitlab|view|id=%s';
 
 /* Object type. */
 $lang->action->search = new stdclass();

module/action/lang/zh-cn.php

@@ -644,7 +644,7 @@ $lang->action->label->kanbancolumn = '看板列|execution|kanban|execution=%s';
 $lang->action->label->kanbanlane   = '看板泳道|execution|kanban|execution=%s&type=all';
 $lang->action->label->kanbancard   = '看板卡片|kanban|view|kanbanID=%s';
 $lang->action->label->mr           = '合并请求|mr|view|id=%s';
-$lang->action->label->gitlab       = 'GitLab|gitlab|view|id=%s';
+$lang->action->label->gitlab       = 'GitLab服务器|gitlab|view|id=%s';
 
 /* Object type. */
 $lang->action->search = new stdclass();

module/bug/control.php

@@ -612,9 +612,9 @@ class bug extends control
         $this->view->productName      = isset($this->products[$productID]) ? $this->products[$productID] : '';
         $this->view->moduleOptionMenu = $moduleOptionMenu;
         $this->view->stories          = $stories;
-        $this->view->projects         = $projects;
+        $this->view->projects         = defined('TUTORIAL') ? $this->loadModel('tutorial')->getProject() : $projects;
         $this->view->project          = $project;
-        $this->view->executions       = $executions;
+        $this->view->executions       = defined('TUTORIAL') ? $this->loadModel('tutorial')->getExecutionPairs() : $executions;
         $this->view->builds           = $builds;
         $this->view->moduleID         = (int)$moduleID;
         $this->view->projectID        = $projectID;

module/tree/model.php

@@ -124,7 +124,15 @@ class treeModel extends model
     public function getOptionMenu($rootID, $type = 'story', $startModule = 0, $branch = 0)
     {
         if(empty($branch)) $branch = 0;
-        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getModulePairs();
+        if(defined('TUTORIAL'))
+        {
+            $modulePairs = $this->loadModel('tutorial')->getModulePairs();
+            if(!is_array($branch)) return $modulePairs;
+
+            $modules = array();
+            foreach($branch as $b) $modules[$b] = $modulePairs;
+            return $modules;
+        }
 
         /* If type of $branch is array, get modules of these branches. */
         if(gettype($branch) == 'array')

module/tutorial/model.php

@@ -275,6 +275,7 @@ class tutorialModel extends model
         $execution->name          = 'Test execution';
         $execution->code          = 'test';
         $execution->lifetime      = '';
+        $execution->attribute     = '';
         $execution->begin         = date('Y-m-d', strtotime('-7 days'));
         $execution->end           = date('Y-m-d', strtotime('+7 days'));
         $execution->days          = 10;