diff --git a/db/update16.3.sql b/db/update16.3.sql index aec553edae..1868e6b66c 100644 --- a/db/update16.3.sql +++ b/db/update16.3.sql @@ -15,3 +15,4 @@ ALTER TABLE `zt_todo` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `del 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`; diff --git a/extension/lite/story/ext/view/create.html.php b/extension/lite/story/ext/view/create.html.php index 65d1aaf201..96ed248326 100644 --- a/extension/lite/story/ext/view/create.html.php +++ b/extension/lite/story/ext/view/create.html.php @@ -165,6 +165,7 @@ + goback, '', 'class="btn btn-wide"') : html::backButton();?> diff --git a/extension/lite/todo/ext/lang/zh-cn/lite.php b/extension/lite/todo/ext/lang/zh-cn/lite.php new file mode 100644 index 0000000000..c1b5e186a7 --- /dev/null +++ b/extension/lite/todo/ext/lang/zh-cn/lite.php @@ -0,0 +1,5 @@ +todo->typeList['task'] = '卡片'; +unset($lang->todo->typeList['cycle']); +unset($lang->todo->typeList['bug']); +unset($lang->todo->typeList['testtask']); diff --git a/module/story/model.php b/module/story/model.php index 76ef986717..adb495edfe 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2913,6 +2913,7 @@ class storyModel extends model ->from(TABLE_STORY) ->where('deleted')->eq(0) ->andWhere('type')->eq($type) + ->andWhere('vision')->eq($this->config->vision) ->andWhere('assignedTo')->eq($account) ->beginIF(!empty($skipProductIDList))->andWhere('product')->notin($skipProductIDList)->fi() ->orderBy('id_desc')