From 22f29fd8d4afe3019c323ed8db0f27dbf6efa7e9 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Fri, 18 Feb 2022 10:40:09 +0800 Subject: [PATCH] *Fix bug 49283 --- db/update16.4.sql | 23 +++++++++++++++++++++++ module/my/lang/en.php | 1 + module/my/lang/zh-cn.php | 1 + module/my/view/story.html.php | 2 +- module/testcase/view/groupcase.html.php | 2 +- module/testsuite/lang/en.php | 1 + module/testsuite/lang/zh-cn.php | 1 + module/testsuite/view/view.html.php | 2 +- 8 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 db/update16.4.sql diff --git a/db/update16.4.sql b/db/update16.4.sql new file mode 100644 index 0000000000..aecc125c66 --- /dev/null +++ b/db/update16.4.sql @@ -0,0 +1,23 @@ +ALTER TABLE `zt_userquery` ADD`common` enum('0','1') NOT NULL DEFAULT '0'; + +ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`; +ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`; +ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`; +ALTER TABLE `zt_projectstory` ADD INDEX `story` (`story`); +ALTER TABLE `zt_group` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `project`; +ALTER TABLE `zt_lang` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `system`; +ALTER TABLE `zt_lang` DROP INDEX `lang`, ADD UNIQUE `lang` (`lang`,`module`,`section`,`key`,`vision`); +ALTER TABLE `zt_doc` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; +ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `type`; +ALTER TABLE `zt_action` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `read`; +ALTER TABLE `zt_searchindex` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; +ALTER TABLE `zt_config` ADD `vision` varchar(10) NOT NULL DEFAULT '' AFTER `id`; +ALTER TABLE `zt_config` DROP INDEX `unique`, ADD UNIQUE `unique` (`vision`,`owner`,`module`,`section`,`key`); +ALTER TABLE `zt_todo` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`; +ALTER TABLE `zt_block` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `account`; +ALTER TABLE `zt_block` DROP INDEX `account_module_type_order`, ADD UNIQUE `account_vision_module_type_order` (`account`, `vision`, `module`, `type`, `order`); +ALTER TABLE `zt_effort` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; +ALTER TABLE `zt_story` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; + +ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`; +UPDATE `zt_user` SET `visions`='rnd,lite'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index d40d1fe11a..b2cb72f428 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -41,6 +41,7 @@ $lang->my->requirement = "My {$lang->URCommon}"; $lang->my->testtask = 'My Test Task'; $lang->my->testcase = 'My Case'; $lang->my->storyConcept = 'Story Concept'; +$lang->my->pri = 'Priority'; $lang->my->indexAction = 'My Index'; $lang->my->calendarAction = 'My Calendar'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index f0fa0775d2..5de4dcf78e 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -41,6 +41,7 @@ $lang->my->requirement = "我的{$lang->URCommon}"; $lang->my->testtask = '我的测试单'; $lang->my->testcase = '我的用例'; $lang->my->storyConcept = $config->URAndSR ? '默认需求概念组合' : '默认需求概念'; +$lang->my->pri = '优先级'; $lang->my->indexAction = '地盘仪表盘'; $lang->my->calendarAction = '我的日程'; diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index dd6b6ece46..d410598f76 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -58,7 +58,7 @@ idAB);?> - task->pri;?>>priAB);?> + my->pri;?>>priAB);?> my->name);?> story->product);?> story->plan);?> diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index e863be5027..e0f3adfddb 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -35,7 +35,7 @@ idAB;?> - priAB;?> + testcase->pri;?>> priAB;?> testcase->title;?> typeAB;?> testtask->lastRunAccount;?> diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index 0b64a3e23d..3171bf426d 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -24,6 +24,7 @@ $lang->testsuite->deleted = 'Deleted'; $lang->testsuite->successSaved = 'Saved'; $lang->testsuite->id = 'ID'; +$lang->testsuite->pri = 'Priority'; $lang->testsuite->common = 'Test Suite'; $lang->testsuite->project = 'Project'; $lang->testsuite->product = $lang->productCommon; diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php index 1103d4f9eb..349fe18e86 100644 --- a/module/testsuite/lang/zh-cn.php +++ b/module/testsuite/lang/zh-cn.php @@ -24,6 +24,7 @@ $lang->testsuite->deleted = '已删除'; $lang->testsuite->successSaved = '保存成功'; $lang->testsuite->id = '编号'; +$lang->testsuite->pri = '优先级'; $lang->testsuite->common = '套件'; $lang->testsuite->project = '所属项目'; $lang->testsuite->product = '所属' . $lang->productCommon; diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php index 7c5c3d60d5..f4962e9033 100644 --- a/module/testsuite/view/view.html.php +++ b/module/testsuite/view/view.html.php @@ -60,7 +60,7 @@ idAB);?> - priAB);?> + testsuite->pri;?>>priAB);?> testcase->module);?> testcase->title);?> testcase->type);?>