From fcf1d669d7f4c7259c92e6d9b5c3369dc4b51663 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Sat, 5 Jun 2021 18:14:44 +0800 Subject: [PATCH] * Revert the changed code of task #38644. --- module/custom/control.php | 13 +++++++++++++ module/custom/lang/de.php | 1 + module/custom/lang/en.php | 1 + module/custom/lang/fr.php | 1 + module/custom/lang/vi.php | 1 + module/custom/lang/zh-cn.php | 1 + module/custom/lang/zh-tw.php | 1 + module/custom/view/browsestoryconcept.html.php | 13 +++++++++++++ module/group/lang/resource.php | 5 ++++- 9 files changed, 36 insertions(+), 1 deletion(-) diff --git a/module/custom/control.php b/module/custom/control.php index 485c0b7b36..f0b13b6818 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -420,6 +420,19 @@ class custom extends control $this->display(); } + /** + * Set story concept. + * + * @param int $key + * @access public + * @return void + */ + public function setDefaultConcept($key = 0) + { + $this->loadModel('setting')->setItem('system.custom.URSR', $key); + die(js::reload('parent')); + } + /** * Delete story concept. * diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 6107d9937b..0066022c91 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -38,6 +38,7 @@ $lang->custom->waterfallCommon = "Waterfall"; $lang->custom->buildin = "Buildin"; $lang->custom->editStoryConcept = "Edit Story Concept"; $lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; $lang->custom->browseStoryConcept = "List of story concepts"; $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->URConcept = "UR Concept"; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 00235b1846..6473f51d14 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -38,6 +38,7 @@ $lang->custom->waterfallCommon = "Waterfall"; $lang->custom->buildin = "Buildin"; $lang->custom->editStoryConcept = "Edit Story Concept"; $lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; $lang->custom->browseStoryConcept = "List of story concepts"; $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->URConcept = "UR Concept"; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 77a1a51ad0..dc63dcbc5b 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -38,6 +38,7 @@ $lang->custom->waterfallCommon = "Waterfall"; $lang->custom->buildin = "Buildin"; $lang->custom->editStoryConcept = "Edit Story Concept"; $lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; $lang->custom->browseStoryConcept = "List of story concepts"; $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->URConcept = "UR Concept"; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index ddffc57c45..f4a8b48a17 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -38,6 +38,7 @@ $lang->custom->waterfallCommon = "Waterfall"; $lang->custom->buildin = "Buildin"; $lang->custom->editStoryConcept = "Edit Story Concept"; $lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; $lang->custom->browseStoryConcept = "List of story concepts"; $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->URConcept = "UR Concept"; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 23a648b109..60b1e10b0b 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -38,6 +38,7 @@ $lang->custom->waterfallCommon = "瀑布"; $lang->custom->buildin = "系统内置"; $lang->custom->editStoryConcept = "编辑需求概念"; $lang->custom->setStoryConcept = "设置需求概念"; +$lang->custom->setDefaultConcept = "设置默认概念"; $lang->custom->browseStoryConcept = "需求概念列表"; $lang->custom->deleteStoryConcept = "删除需求概念"; $lang->custom->URConcept = "用需概念"; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 2e63c697f2..5dff2482e1 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -38,6 +38,7 @@ $lang->custom->waterfallCommon = "瀑布"; $lang->custom->buildin = "系統內置"; $lang->custom->editStoryConcept = "編輯需求概念"; $lang->custom->setStoryConcept = "設置需求概念"; +$lang->custom->setDefaultConcept = "設置預設概念"; $lang->custom->browseStoryConcept = "需求概念列表"; $lang->custom->deleteStoryConcept = "刪除需求概念"; $lang->custom->URConcept = "用需概念"; diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php index a369471976..bd4627b047 100644 --- a/module/custom/view/browsestoryconcept.html.php +++ b/module/custom/view/browsestoryconcept.html.php @@ -23,6 +23,9 @@ + + + config->URAndSR):?> @@ -33,6 +36,9 @@ $URSR):?> + + + config->URAndSR):?> @@ -48,4 +54,11 @@
custom->default;?> custom->URConcept;?>
custom->URSR) echo 'checked';?>>
+ diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index cbca515e89..1259b6bf83 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1081,6 +1081,7 @@ $lang->resource->custom->timezone = 'timezone'; $lang->resource->custom->setStoryConcept = 'setStoryConcept'; $lang->resource->custom->editStoryConcept = 'editStoryConcept'; $lang->resource->custom->browseStoryConcept = 'browseStoryConcept'; +$lang->resource->custom->setDefaultConcept = 'setDefaultConcept'; $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept'; $lang->custom->methodOrder[5] = 'index'; @@ -1095,7 +1096,8 @@ $lang->custom->methodOrder[45] = 'timezone'; $lang->custom->methodOrder[50] = 'setStoryConcept'; $lang->custom->methodOrder[55] = 'editStoryConcept'; $lang->custom->methodOrder[60] = 'browseStoryConcept'; -$lang->custom->methodOrder[65] = 'deleteStoryConcept'; +$lang->custom->methodOrder[65] = 'setDefaultConcept'; +$lang->custom->methodOrder[70] = 'deleteStoryConcept'; $lang->resource->datatable = new stdclass(); $lang->resource->datatable->setGlobal = 'setGlobal'; @@ -1806,6 +1808,7 @@ $lang->changelog['15.0.rc1'][] = 'user-execution'; $lang->changelog['15.0.rc1'][] = 'custom-setStoryConcept'; $lang->changelog['15.0.rc1'][] = 'custom-editStoryConcept'; $lang->changelog['15.0.rc1'][] = 'custom-browseStoryConcept'; +$lang->changelog['15.0.rc1'][] = 'custom-setDefaultConcept'; $lang->changelog['15.0.rc1'][] = 'custom-deleteStoryConcept'; $lang->changelog['15.0.rc1'][] = 'search-index'; $lang->changelog['15.0.rc1'][] = 'search-buildIndex';