From 8d26d61fb1991fe4ffe389594ce490ea963345af Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 29 Jul 2019 16:53:48 +0800 Subject: [PATCH 1/9] * Finish task #6162. --- module/common/view/datatable.fix.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index 6e8952895d..f0a271f871 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -49,7 +49,7 @@ $(function()
-

datatable->showModule?>

+

datatable->showModule?>

'> From f0671e2ead43146a904ee50896ca7c3ce6159108 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 30 Jul 2019 08:39:39 +0800 Subject: [PATCH 2/9] * Finish task #6165. --- module/entry/view/log.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/entry/view/log.html.php b/module/entry/view/log.html.php index 652a6b6f60..b9b343a69b 100644 --- a/module/entry/view/log.html.php +++ b/module/entry/view/log.html.php @@ -18,7 +18,7 @@ name;?> entry->log;?>
- " . $lang->entry->setting, '', "class='btn btn-primary'");?> + " . $lang->entry->setting, '', "class='btn btn-primary iframe'", '', true);?>
From e6d63124057863afdb164cae3f79a04b9958e872 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 30 Jul 2019 09:03:01 +0800 Subject: [PATCH 3/9] * Add subStatus to database. --- db/update11.6.sql | 9 +++++++++ db/zentao.sql | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/db/update11.6.sql b/db/update11.6.sql index 9bfd776fa2..93c8306e39 100644 --- a/db/update11.6.sql +++ b/db/update11.6.sql @@ -2,3 +2,12 @@ ALTER TABLE `zt_translation` CHANGE `refer` `referer` text COLLATE 'utf8_general_ci' NOT NULL AFTER `value`, CHANGE `translationTime` `translatedTime` datetime NOT NULL AFTER `translator`, CHANGE `reviewTime` `reviewedTime` datetime NOT NULL AFTER `reviewer`; + +ALTER TABLE `zt_product` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_release` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_story` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_project` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_task` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_bug` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_testcase` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_testtask` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; diff --git a/db/zentao.sql b/db/zentao.sql index 870efc0f9b..a4bff7cd52 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -68,6 +68,7 @@ CREATE TABLE IF NOT EXISTS `zt_bug` ( `found` varchar(30) NOT NULL default '', `steps` text NOT NULL, `status` enum('active','resolved','closed') NOT NULL default 'active', + `subStatus` varchar(30) NOT NULL default '', `color` char(7) NOT NULL, `confirmed` tinyint(1) NOT NULL default '0', `activatedCount` smallint(6) NOT NULL, @@ -154,6 +155,7 @@ CREATE TABLE IF NOT EXISTS `zt_case` ( `scriptStatus` varchar(30) NOT NULL, `scriptLocation` varchar(255) NOT NULL, `status` char(30) NOT NULL default '1', + `subStatus` varchar(30) NOT NULL default '', `color` char(7) NOT NULL, `frequency` enum('1','2','3') NOT NULL default '1', `order` tinyint(30) unsigned NOT NULL default '0', @@ -444,6 +446,7 @@ CREATE TABLE IF NOT EXISTS `zt_product` ( `line` mediumint(8) NOT NULL, `type` varchar(30) NOT NULL default 'normal', `status` varchar(30) NOT NULL default '', + `subStatus` varchar(30) NOT NULL default '', `desc` text NOT NULL, `PO` varchar(30) NOT NULL, `QD` varchar(30) NOT NULL, @@ -487,6 +490,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` ( `end` date NOT NULL, `days` smallint(5) unsigned NOT NULL, `status` varchar(10) NOT NULL, + `subStatus` varchar(30) NOT NULL default '', `statge` enum('1','2','3','4','5') NOT NULL default '1', `pri` enum('1','2','3','4') NOT NULL default '1', `desc` text NOT NULL, @@ -544,6 +548,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` ( `leftBugs` text NOT NULL, `desc` text NOT NULL, `status` varchar(20) NOT NULL default 'normal', + `subStatus` varchar(30) NOT NULL default '', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), KEY `product` (`product`), @@ -565,6 +570,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( `pri` tinyint(3) unsigned NOT NULL default '3', `estimate` float unsigned NOT NULL, `status` enum('','changed','active','draft','closed') NOT NULL default '', + `subStatus` varchar(30) NOT NULL default '', `color` char(7) NOT NULL, `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released', 'closed') NOT NULL DEFAULT 'wait', `stagedBy` char(30) NOT NULL, @@ -634,6 +640,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` ( `left` float unsigned NOT NULL, `deadline` date NOT NULL, `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL default 'wait', + `subStatus` varchar(30) NOT NULL default '', `color` char(7) NOT NULL, `mailto` text, `desc` text NOT NULL, @@ -771,6 +778,7 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` ( `desc` text NOT NULL, `report` text NOT NULL, `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait', + `subStatus` varchar(30) NOT NULL default '', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), KEY `product` (`product`), From c06773e491651dd7fd54ea70ca70a47ea4bfd0fc Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 30 Jul 2019 09:03:09 +0800 Subject: [PATCH 4/9] * Finish task #6156. --- module/doc/view/objectlibs.html.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 69c4af2d7a..ec334307fe 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -26,9 +26,7 @@
- from == 'doc'):?> - name;?> - + from == 'doc' ? $object->name : $object->name . $lang->doc->common;?>
", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?> ", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?> From ed8646a54a97987e0dfb346948135fa6f37a3361 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 30 Jul 2019 09:06:18 +0800 Subject: [PATCH 5/9] * Change zt_testcase to zt_case. --- db/update11.6.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/update11.6.sql b/db/update11.6.sql index 93c8306e39..c6eb221c64 100644 --- a/db/update11.6.sql +++ b/db/update11.6.sql @@ -9,5 +9,5 @@ ALTER TABLE `zt_story` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; ALTER TABLE `zt_project` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; ALTER TABLE `zt_task` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; ALTER TABLE `zt_bug` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; -ALTER TABLE `zt_testcase` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; +ALTER TABLE `zt_case` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; ALTER TABLE `zt_testtask` ADD `subStatus` varchar(30) NOT NULL AFTER `status`; From 5e32ee1081cf1c01fec251b3c190b180ea534f75 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 30 Jul 2019 10:10:10 +0800 Subject: [PATCH 6/9] * Add subStatus in lang files. * Change sub status when status is changed and sub status is not set, and record the changes. --- module/bug/lang/de.php | 1 + module/bug/lang/en.php | 1 + module/bug/lang/zh-cn.php | 1 + module/common/model.php | 24 +++++++++++++++++++++++- module/product/lang/de.php | 1 + module/product/lang/en.php | 1 + module/product/lang/zh-cn.php | 1 + module/project/lang/de.php | 1 + module/project/lang/en.php | 1 + module/project/lang/zh-cn.php | 1 + module/release/lang/de.php | 1 + module/release/lang/en.php | 1 + module/release/lang/zh-cn.php | 1 + module/story/lang/de.php | 1 + module/story/lang/en.php | 1 + module/story/lang/zh-cn.php | 1 + module/task/lang/de.php | 1 + module/task/lang/en.php | 1 + module/task/lang/zh-cn.php | 1 + module/testcase/lang/de.php | 1 + module/testcase/lang/en.php | 1 + module/testcase/lang/zh-cn.php | 1 + module/testtask/lang/de.php | 1 + module/testtask/lang/en.php | 1 + module/testtask/lang/zh-cn.php | 1 + 25 files changed, 47 insertions(+), 1 deletion(-) diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 2f40a8e078..3166a5a70e 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -30,6 +30,7 @@ $lang->bug->browser = 'Browser'; $lang->bug->steps = 'Reproduktionsschritte'; $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; +$lang->bug->subStatus = 'Sub Status'; $lang->bug->activatedCount = 'Aktiv'; $lang->bug->activatedCountAB = 'Aktiv'; $lang->bug->activatedDate = 'Aktiv seit'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 7b0831dd2e..a5039d2a7c 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -30,6 +30,7 @@ $lang->bug->browser = 'Browser'; $lang->bug->steps = 'Repro Steps'; $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; +$lang->bug->subStatus = 'Sub Status'; $lang->bug->activatedCount = 'Activated Times'; $lang->bug->activatedCountAB = 'Active'; $lang->bug->activatedDate = 'ActivatedDate'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 81f18b16a4..43768c566f 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -30,6 +30,7 @@ $lang->bug->browser = '浏览器'; $lang->bug->steps = '重现步骤'; $lang->bug->status = 'Bug状态'; $lang->bug->statusAB = '状态'; +$lang->bug->subStatus = 'Bug子状态'; $lang->bug->activatedCount = '激活次数'; $lang->bug->activatedCountAB = '激活次数'; $lang->bug->activatedDate = '激活日期'; diff --git a/module/common/model.php b/module/common/model.php index b0af0b2c0e..3460942eb2 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1075,7 +1075,29 @@ EOD; */ public static function createChanges($old, $new) { - global $config; + global $app, $config; + + /** + * 当主状态改变并且未设置子状态的值时把子状态的值置空并记录日志。 + * Change sub status when status is changed and sub status is not set, and record the changes. + */ + if(isset($config->bizVersion)) + { + $oldID = zget($old, 'id', ''); + $oldStatus = zget($old, 'status', ''); + $oldSubStatus = zget($old, 'subStatus', ''); + $newStatus = zget($new, 'status', ''); + $newSubStatus = zget($new, 'subStatus', ''); + + if($oldID && $oldStatus && $oldSubStatus && $newStatus && !$newSubStatus && $oldStatus != $newStatus) + { + $table = zget($config->objectTables, $app->getModuleName()); + $app->dbh->exec("UPDATE $table SET `subStatus` = '' WHERE `id` = $oldID"); + + $new->subStatus = ''; + } + } + $changes = array(); $magicQuote = get_magic_quotes_gpc(); foreach($new as $key => $value) diff --git a/module/product/lang/de.php b/module/product/lang/de.php index 73a21b97e9..c4b3136843 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -73,6 +73,7 @@ $lang->product->order = 'Sortierung'; $lang->product->type = 'Typ'; $lang->product->typeAB = 'Typ'; $lang->product->status = 'Status'; +$lang->product->subStatus = 'Sub Status'; $lang->product->desc = 'Beschreibung'; $lang->product->manager = 'Manager'; $lang->product->PO = 'PO'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 848448d5fd..e1da41d713 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -73,6 +73,7 @@ $lang->product->order = 'Rank'; $lang->product->type = 'Type'; $lang->product->typeAB = 'Type'; $lang->product->status = 'Status'; +$lang->product->subStatus = 'Sub Status'; $lang->product->desc = 'Description'; $lang->product->manager = 'Managers'; $lang->product->PO = "{$lang->productCommon} Owner"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 7254bb1e89..9c2296f568 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -73,6 +73,7 @@ $lang->product->order = '排序'; $lang->product->type = "{$lang->productCommon}类型"; $lang->product->typeAB = "类型"; $lang->product->status = '状态'; +$lang->product->subStatus = '子状态'; $lang->product->desc = "{$lang->productCommon}描述"; $lang->product->manager = '负责人'; $lang->product->PO = "{$lang->productCommon}负责人"; diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 92b9dd2d7e..7daf65914e 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -25,6 +25,7 @@ $lang->project->workHour = 'Stunden'; $lang->project->totalHours = 'Arbeitsstunden'; $lang->project->totalDays = 'Arbeitstage'; $lang->project->status = 'Status'; +$lang->project->subStatus = 'Sub Status'; $lang->project->desc = 'Beschreibung'; $lang->project->owner = 'Besitzer'; $lang->project->PO = 'PO'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 5b0ce4ce3f..40940ce81d 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -25,6 +25,7 @@ $lang->project->workHour = ' Hours'; $lang->project->totalHours = 'Available Hours'; $lang->project->totalDays = 'Available Days'; $lang->project->status = 'Status'; +$lang->project->subStatus = 'Sub Status'; $lang->project->desc = 'Description'; $lang->project->owner = 'Owner'; $lang->project->PO = "{$lang->projectCommon} Owner"; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 66077a339f..f5703f89c0 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -25,6 +25,7 @@ $lang->project->workHour = '工时'; $lang->project->totalHours = '可用工时'; $lang->project->totalDays = '可用工日'; $lang->project->status = $lang->projectCommon . '状态'; +$lang->project->subStatus = $lang->projectCommon . '子状态'; $lang->project->desc = $lang->projectCommon . '描述'; $lang->project->owner = '负责人'; $lang->project->PO = $lang->productCommon . '负责人'; diff --git a/module/release/lang/de.php b/module/release/lang/de.php index ff1bf2b892..d05e738fee 100644 --- a/module/release/lang/de.php +++ b/module/release/lang/de.php @@ -40,6 +40,7 @@ $lang->release->marker = 'Meilensteine'; $lang->release->date = 'Datum'; $lang->release->desc = 'Beschreibung'; $lang->release->status = 'Status'; +$lang->release->subStatus = 'Sub Status'; $lang->release->last = 'Letztes Release'; $lang->release->unlinkStory = 'Story entfernen'; $lang->release->unlinkBug = 'Bug entfernen'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index f19a781126..86f0b64017 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -40,6 +40,7 @@ $lang->release->marker = 'Milestone'; $lang->release->date = 'Release Date'; $lang->release->desc = 'Description'; $lang->release->status = 'Status'; +$lang->release->subStatus = 'Sub Status'; $lang->release->last = 'Last Release'; $lang->release->unlinkStory = 'Unlink Story'; $lang->release->unlinkBug = 'Unlink Bug'; diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 4f0b5f7cdc..fb2a646e98 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -40,6 +40,7 @@ $lang->release->marker = '里程碑'; $lang->release->date = '发布日期'; $lang->release->desc = '描述'; $lang->release->status = '状态'; +$lang->release->subStatus = '子状态'; $lang->release->last = '上次发布'; $lang->release->unlinkStory = '移除需求'; $lang->release->unlinkBug = '移除Bug'; diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 287e22d7f3..e4d4db83d8 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -76,6 +76,7 @@ $lang->story->estimate = 'Schätzung(h)'; $lang->story->estimateAB = 'Schätzung(h)'; $lang->story->hour = 'Stunde'; $lang->story->status = 'Status'; +$lang->story->subStatus = 'Sub Status'; $lang->story->stage = 'Phase'; $lang->story->stageAB = 'Phase'; $lang->story->stagedBy = 'SetBy'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index f36bcbcc39..3f07293bd4 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -76,6 +76,7 @@ $lang->story->estimate = 'Estimates'; $lang->story->estimateAB = 'Est.(h)'; $lang->story->hour = 'Hours'; $lang->story->status = 'Status'; +$lang->story->subStatus = 'Sub Status'; $lang->story->stage = 'Phase'; $lang->story->stageAB = 'Phase'; $lang->story->stagedBy = 'SetBy'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index e2b6abcbd0..a6b94920f5 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -76,6 +76,7 @@ $lang->story->estimate = '预计工时'; $lang->story->estimateAB = '预计'; $lang->story->hour = '小时'; $lang->story->status = '当前状态'; +$lang->story->subStatus = '子状态'; $lang->story->stage = '所处阶段'; $lang->story->stageAB = '阶段'; $lang->story->stagedBy = '设置阶段者'; diff --git a/module/task/lang/de.php b/module/task/lang/de.php index c09c0ae17c..32e63f4785 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -83,6 +83,7 @@ $lang->task->date = 'Datum'; $lang->task->deadline = 'Fälligkeit'; $lang->task->deadlineAB = 'Fälligkeit'; $lang->task->status = 'Status'; +$lang->task->subStatus = 'Sub Status'; $lang->task->desc = 'Beschreibung'; $lang->task->assign = 'Zuordnen'; $lang->task->assignAction = 'Assign Task'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 85edb74a29..512ea5e319 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -83,6 +83,7 @@ $lang->task->date = 'Date'; $lang->task->deadline = 'Deadline'; $lang->task->deadlineAB = 'Deadline'; $lang->task->status = 'Status'; +$lang->task->subStatus = 'Sub Status'; $lang->task->desc = 'Description'; $lang->task->assign = 'Assign'; $lang->task->assignAction = 'Assign Task'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index beb763faa6..09d0284146 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -83,6 +83,7 @@ $lang->task->date = '日期'; $lang->task->deadline = '截止日期'; $lang->task->deadlineAB = '截止'; $lang->task->status = '任务状态'; +$lang->task->subStatus = '任务子状态'; $lang->task->desc = '任务描述'; $lang->task->assign = '指派'; $lang->task->assignAction = '指派任务'; diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index ecf04983b6..a517bb07fe 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -21,6 +21,7 @@ $lang->testcase->precondition = 'Voraussetzungen'; $lang->testcase->pri = 'Priorität'; $lang->testcase->type = 'Typ'; $lang->testcase->status = 'Status'; +$lang->testcase->subStatus = 'Sub Status'; $lang->testcase->steps = 'Schritte'; $lang->testcase->openedBy = 'Ersteller'; $lang->testcase->openedDate = 'Erstellt am'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 3bd215d4aa..3a0f388ddb 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -21,6 +21,7 @@ $lang->testcase->precondition = 'Prerequisite'; $lang->testcase->pri = 'Priority'; $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; +$lang->testcase->subStatus = 'Sub Status'; $lang->testcase->steps = 'Steps'; $lang->testcase->openedBy = 'CreatedBy'; $lang->testcase->openedDate = 'CreatedDate'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 104d829c7f..a602e98974 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -21,6 +21,7 @@ $lang->testcase->precondition = '前置条件'; $lang->testcase->pri = '优先级'; $lang->testcase->type = '用例类型'; $lang->testcase->status = '用例状态'; +$lang->testcase->subStatus = '用例子状态'; $lang->testcase->steps = '用例步骤'; $lang->testcase->openedBy = '由谁创建'; $lang->testcase->openedDate = '创建日期'; diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index 4c9af7f7fc..4e49d75b51 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -63,6 +63,7 @@ $lang->testtask->end = 'Ende'; $lang->testtask->desc = 'Beschreibung'; $lang->testtask->mailto = 'Mail an'; $lang->testtask->status = 'Status'; +$lang->testtask->subStatus = 'Sub Status'; $lang->testtask->assignedTo = 'Zugeordnet'; $lang->testtask->linkVersion = 'Version'; $lang->testtask->lastRunAccount = 'Ausgeführt von'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index a3cf7a49a8..ae33694809 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -63,6 +63,7 @@ $lang->testtask->end = 'End'; $lang->testtask->desc = 'Description'; $lang->testtask->mailto = 'Mailto'; $lang->testtask->status = 'Status'; +$lang->testtask->subStatus = 'Sub Status'; $lang->testtask->assignedTo = 'Assigned'; $lang->testtask->linkVersion = 'Build'; $lang->testtask->lastRunAccount = 'RunBy'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 75ab22f7a3..35e2f52550 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -63,6 +63,7 @@ $lang->testtask->end = '结束日期'; $lang->testtask->desc = '描述'; $lang->testtask->mailto = '抄送给'; $lang->testtask->status = '当前状态'; +$lang->testtask->subStatus = '子状态'; $lang->testtask->assignedTo = '指派给'; $lang->testtask->linkVersion = '版本'; $lang->testtask->lastRunAccount = '执行人'; From 4a544fb1c50b92a601e38a0a3a06fad547ee7d28 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 30 Jul 2019 10:14:23 +0800 Subject: [PATCH 7/9] * Add lang file to product. --- module/product/lang/en.php | 2 ++ module/product/lang/zh-cn.php | 52 ++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 848448d5fd..8ddc2d6f7a 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -90,6 +90,8 @@ $lang->product->plan = 'Plan'; $lang->product->iteration = 'Iterations'; $lang->product->iterationInfo = '%s Iteration'; $lang->product->iterationView = 'Detail'; +$lang->product->createdBy = 'CreatedBy'; +$lang->product->createdDate = 'createdDate'; $lang->product->searchStory = 'Search'; $lang->product->assignedToMe = 'AssignedToMe'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 7254bb1e89..68476e9fa0 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -65,31 +65,33 @@ $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗 $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！"; $lang->product->accessDenied = "您无权访问该{$lang->productCommon}"; -$lang->product->id = '编号'; -$lang->product->name = "{$lang->productCommon}名称"; -$lang->product->code = "{$lang->productCommon}代号"; -$lang->product->line = "{$lang->productCommon}线"; -$lang->product->order = '排序'; -$lang->product->type = "{$lang->productCommon}类型"; -$lang->product->typeAB = "类型"; -$lang->product->status = '状态'; -$lang->product->desc = "{$lang->productCommon}描述"; -$lang->product->manager = '负责人'; -$lang->product->PO = "{$lang->productCommon}负责人"; -$lang->product->QD = '测试负责人'; -$lang->product->RD = '发布负责人'; -$lang->product->acl = '访问控制'; -$lang->product->whitelist = '分组白名单'; -$lang->product->branch = '所属%s'; -$lang->product->qa = '测试'; -$lang->product->release = '发布'; -$lang->product->allRelease = '所有发布'; -$lang->product->maintain = '维护中'; -$lang->product->latestDynamic = '最新动态'; -$lang->product->plan = '计划'; -$lang->product->iteration = '版本迭代'; -$lang->product->iterationInfo = '迭代 %s 次'; -$lang->product->iterationView = '查看详情'; +$lang->product->id = '编号'; +$lang->product->name = "{$lang->productCommon}名称"; +$lang->product->code = "{$lang->productCommon}代号"; +$lang->product->line = "{$lang->productCommon}线"; +$lang->product->order = '排序'; +$lang->product->type = "{$lang->productCommon}类型"; +$lang->product->typeAB = "类型"; +$lang->product->status = '状态'; +$lang->product->desc = "{$lang->productCommon}描述"; +$lang->product->manager = '负责人'; +$lang->product->PO = "{$lang->productCommon}负责人"; +$lang->product->QD = '测试负责人'; +$lang->product->RD = '发布负责人'; +$lang->product->acl = '访问控制'; +$lang->product->whitelist = '分组白名单'; +$lang->product->branch = '所属%s'; +$lang->product->qa = '测试'; +$lang->product->release = '发布'; +$lang->product->allRelease = '所有发布'; +$lang->product->maintain = '维护中'; +$lang->product->latestDynamic = '最新动态'; +$lang->product->plan = '计划'; +$lang->product->iteration = '版本迭代'; +$lang->product->iterationInfo = '迭代 %s 次'; +$lang->product->iterationView = '查看详情'; +$lang->product->createdBy = '由谁创建'; +$lang->product->createdDate = '创建日期'; $lang->product->searchStory = '搜索'; $lang->product->assignedToMe = '指给我'; From d8f65cf55f5be4ebb23d4bd9d76774cec5909d85 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 30 Jul 2019 10:26:19 +0800 Subject: [PATCH 8/9] * Add lang file to productplan. --- module/productplan/lang/en.php | 32 ++++++++++++++++--------------- module/productplan/lang/zh-cn.php | 32 ++++++++++++++++--------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index eb8c228cd0..01ecd1df5b 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -43,21 +43,23 @@ $lang->productplan->confirmUnlinkStory = "Do you want to unlink this story?"; $lang->productplan->confirmUnlinkBug = "Do you want to unlink this bug?"; $lang->productplan->noPlan = 'No plans yet. '; -$lang->productplan->id = 'ID'; -$lang->productplan->product = $lang->productCommon; -$lang->productplan->branch = 'Platform/Branch'; -$lang->productplan->title = 'Title'; -$lang->productplan->desc = 'Description'; -$lang->productplan->begin = 'Begin'; -$lang->productplan->end = 'End'; -$lang->productplan->last = 'Last Plan'; -$lang->productplan->future = 'TBD'; -$lang->productplan->stories = 'Story'; -$lang->productplan->bugs = 'Bug'; -$lang->productplan->hour = 'Hours'; -$lang->productplan->project = $lang->projectCommon; -$lang->productplan->parent = "Parent Plan"; -$lang->productplan->children= "Child Plan"; +$lang->productplan->id = 'ID'; +$lang->productplan->product = $lang->productCommon; +$lang->productplan->branch = 'Platform/Branch'; +$lang->productplan->title = 'Title'; +$lang->productplan->desc = 'Description'; +$lang->productplan->begin = 'Begin'; +$lang->productplan->end = 'End'; +$lang->productplan->last = 'Last Plan'; +$lang->productplan->future = 'TBD'; +$lang->productplan->stories = 'Story'; +$lang->productplan->bugs = 'Bug'; +$lang->productplan->hour = 'Hours'; +$lang->productplan->project = $lang->projectCommon; +$lang->productplan->parent = "Parent Plan"; +$lang->productplan->children = "Child Plan"; +$lang->productplan->order = "Order"; +$lang->productplan->deleted = "Deleted"; $lang->productplan->endList[7] = '1 Week'; $lang->productplan->endList[14] = '2 Weeks'; diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 12d09fb77c..15e1079388 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -43,21 +43,23 @@ $lang->productplan->confirmUnlinkStory = "您确认移除该需求吗？"; $lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？"; $lang->productplan->noPlan = '暂时没有计划。'; -$lang->productplan->id = '编号'; -$lang->productplan->product = $lang->productCommon; -$lang->productplan->branch = '平台/分支'; -$lang->productplan->title = '名称'; -$lang->productplan->desc = '描述'; -$lang->productplan->begin = '开始日期'; -$lang->productplan->end = '结束日期'; -$lang->productplan->last = '上次计划'; -$lang->productplan->future = '待定'; -$lang->productplan->stories = '需求数'; -$lang->productplan->bugs = 'Bug数'; -$lang->productplan->hour = '工时'; -$lang->productplan->project = $lang->projectCommon; -$lang->productplan->parent = "父计划"; -$lang->productplan->children= "子计划"; +$lang->productplan->id = '编号'; +$lang->productplan->product = $lang->productCommon; +$lang->productplan->branch = '平台/分支'; +$lang->productplan->title = '名称'; +$lang->productplan->desc = '描述'; +$lang->productplan->begin = '开始日期'; +$lang->productplan->end = '结束日期'; +$lang->productplan->last = '上次计划'; +$lang->productplan->future = '待定'; +$lang->productplan->stories = '需求数'; +$lang->productplan->bugs = 'Bug数'; +$lang->productplan->hour = '工时'; +$lang->productplan->project = $lang->projectCommon; +$lang->productplan->parent = "父计划"; +$lang->productplan->children = "子计划"; +$lang->productplan->order = "排序"; +$lang->productplan->deleted = "已删除"; $lang->productplan->endList[7] = '一星期'; $lang->productplan->endList[14] = '两星期'; From 0f3e4c54ab5af64056c7b41c540238f3a89f5087 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 30 Jul 2019 10:40:43 +0800 Subject: [PATCH 9/9] * Add lang to story. --- module/story/lang/en.php | 3 +++ module/story/lang/zh-cn.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 3f07293bd4..f77a4aabc7 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -68,6 +68,9 @@ $lang->story->source = 'From'; $lang->story->sourceNote = 'Note'; $lang->story->fromBug = 'From Bug'; $lang->story->title = 'Title'; +$lang->story->type = 'Type'; +$lang->story->color = 'Color'; +$lang->story->toBug = 'ToBug'; $lang->story->spec = 'Description'; $lang->story->assign = 'Assign'; $lang->story->verify = 'Acceptance'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index a6b94920f5..05425222bb 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -68,6 +68,9 @@ $lang->story->source = '需求来源'; $lang->story->sourceNote = '来源备注'; $lang->story->fromBug = '来源Bug'; $lang->story->title = '需求名称'; +$lang->story->type = '需求类型'; +$lang->story->color = '标题颜色'; +$lang->story->toBug = '转Bug'; $lang->story->spec = '需求描述'; $lang->story->assign = '指派给'; $lang->story->verify = '验收标准';