diff --git a/module/action/config.php b/module/action/config.php index 7b0ca2de37..c40a551519 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -55,4 +55,4 @@ $config->action->majorList['execution'] = array('opened', 'edited'); $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,'; $config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,'; -$config->action->noLinkModules = ',doclib,module,webhook,gitlab,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,'; +$config->action->noLinkModules = ',doclib,module,webhook,gitlab,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,'; diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js index e69de29bb2..233ef6eee9 100644 --- a/module/custom/js/mode.js +++ b/module/custom/js/mode.js @@ -0,0 +1,8 @@ +$(function() +{ + $('#modeTab').addClass('btn-active-text'); + $('[name=mode]').change(function() + { + $(this).val() == 'new' ? $('#changeModeTips').removeClass('hidden') : $('#changeModeTips').addClass('hidden'); + }); +}) diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 2082f26f45..e5f53d6f79 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -220,6 +220,7 @@ $lang->custom->menuTip = 'Click to show/hide the menu. Drag to switch d $lang->custom->saveFail = 'Failed to save!'; $lang->custom->page = ' Page'; $lang->custom->changeClassicTip = 'The Program module will be hidden, if you switch to the classic mode.'; +$lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.'; $lang->custom->scoreStatus[1] = 'On'; $lang->custom->scoreStatus[0] = 'Off'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 0d5628aa4c..dd1a8dfb83 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -220,6 +220,7 @@ $lang->custom->menuTip = '点击显示或隐藏导航条目,拖拽来 $lang->custom->saveFail = '保存失败!'; $lang->custom->page = '页面'; $lang->custom->changeClassicTip = '切换为老版本的习惯后,系统将取消项目集功能。'; +$lang->custom->changeModeTips = '历史删除数据不参与数据归并流程,切换模式后将不支持还原,请知悉'; $lang->custom->scoreStatus[1] = '开启'; $lang->custom->scoreStatus[0] = '关闭'; diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index 1f7fbebd90..d5a864adcb 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -32,12 +32,12 @@ - custom->switch);?> + + custom->switch);?> + + -