diff --git a/db/update21.6.beta.sql b/db/update21.6.beta.sql index 2613adb969..3e99278349 100644 --- a/db/update21.6.beta.sql +++ b/db/update21.6.beta.sql @@ -12,8 +12,12 @@ INSERT INTO `zt_workflowdatasource` (`type`, `name`, `code`, `buildin`, `vision` UPDATE `zt_workflowfield` SET `control` = 'select', `options` = (SELECT id FROM `zt_workflowdatasource` WHERE `code` = 'color' limit 1) WHERE `module` = 'testcase' AND `field` = 'color'; UPDATE `zt_workflowfield` SET `control` = 'select', `options` = (SELECT id FROM `zt_workflowdatasource` WHERE `code` = 'bugs' limit 1) WHERE `module` = 'testcase' AND `field` = 'fromBug'; UPDATE `zt_workflowfield` SET `control` = 'select', `options` = (SELECT id FROM `zt_workflowdatasource` WHERE `code` = 'color' limit 1) WHERE `module` = 'bug' AND `field` = 'color'; +UPDATE `zt_workflowfield` SET `control` = 'select', `options` = (SELECT id FROM `zt_workflowdatasource` WHERE `code` = 'color' limit 1) WHERE `module` = 'task' AND `field` = 'color'; +UPDATE `zt_workflowfield` SET `control` = 'select', `options` = (SELECT id FROM `zt_workflowdatasource` WHERE `code` = 'bugs' limit 1) WHERE `module` = 'task' AND `field` = 'fromBug'; DELETE FROM `zt_workflowfield` WHERE `module` = 'testcase' AND `field` = 'order'; DELETE FROM `zt_workflowfield` WHERE `module` = 'testcase' AND `field` = 'frequency'; DELETE FROM `zt_workflowfield` WHERE `module` = 'product' AND `field` = 'order'; DELETE FROM `zt_workflowfield` WHERE `module` = 'product' AND `field` = 'createdVersion'; DELETE FROM `zt_workflowfield` WHERE `module` = 'bug' AND `field` = 'storyVersion'; +DELETE FROM `zt_workflowfield` WHERE `module` = 'task' AND `field` in ('storyVersion', 'designVersion', 'v1', 'v2', 'vision'); +DELETE FROM `zt_workflowfield` WHERE `module` in ('project', 'execution') AND `field` in ('budgetUnit', 'output', 'path', 'grade', 'version', 'parentVersion', 'openedVersion', 'order', 'vision', 'team'); diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 05d02b59f9..c18310c837 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -156,7 +156,7 @@ $lang->task->lastEdited = '最后编辑'; $lang->task->recordWorkhour = '工时'; $lang->task->editEffort = '编辑工时'; $lang->task->deleteWorkhour = '删除工时'; -$lang->task->repo = '所属版本库'; +$lang->task->repo = '所属代码库'; $lang->task->mr = '合并请求'; $lang->task->entry = '代码路径'; $lang->task->lines = '代码行';