Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#51105,51102

Browse Source
This commit is contained in:
zenggang
2022-03-18 05:17:53 +00:00
parent 307c410724
commit ed17f3b7bb
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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/tutorial/model.php
+1
View File
@@ -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;