diff --git a/module/admin/config.php b/module/admin/config.php index 4bc085c58c..0826329d7d 100644 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -9,10 +9,6 @@ $config->url->extension = 'http://www.zentao.net/extension-browse.html'; $config->url->donation = 'http://www.zentao.net/help-donation.html'; $config->url->service = 'http://www.cnezsoft.com/article-browse-1078.html'; -$config->admin->flow2Ext['onlyTest'] = 'zentaotest'; -$config->admin->flow2Ext['onlyTask'] = 'zentaotask'; -$config->admin->flow2Ext['onlyStory'] = 'zentaostory'; - $config->win2Unix->renameTables = array( 'zt_casestep' => 'zt_caseStep' , 'zt_doclib' => 'zt_docLib' , diff --git a/module/admin/control.php b/module/admin/control.php index 669b404c20..9ded1d72f8 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -183,8 +183,7 @@ class admin extends control { if($_POST) { - $this->loadModel('setting')->setItem('system.common.global.flow', $this->post->flow, 0); - if($this->post->flow != 'full') die(js::locate($this->createLink('extension', 'install', "extension={$this->config->admin->flow2Ext[$this->post->flow]}"), 'parent')); + if($this->post->flow != 'full') die(js::locate($this->createLink('extension', 'install', "extension={$this->post->flow}"), 'parent')); die(js::reload( 'parent.parent')); } $this->display(); diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index d4bcc23b81..5d52870b45 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -58,9 +58,9 @@ $lang->admin->bind->success = "Bind success"; $lang->admin->selectFlow = 'How do you plan to use zentao?'; -$lang->admin->flowList['full'] = 'All features(including product, project, plan, release, story, task, bug, case, testtask, doc and so on.)'; -$lang->admin->flowList['onlyTest'] = 'Only testing(including product, release, bug, case, testtask, doc and so on.)'; -$lang->admin->flowList['onlyTask'] = 'Only task (including project, task, doc and so on.)'; -$lang->admin->flowList['onlyStory'] = 'Only story(including product, story, plan, release, doc and so on.)'; +$lang->admin->flowList['full'] = 'All features(including product, project, plan, release, story, task, bug, case, testtask, doc and so on.)'; +$lang->admin->flowList['zentaotest'] = 'Only testing(including product, release, bug, case, testtask, doc and so on.)'; +$lang->admin->flowList['zentaotask'] = 'Only task (including project, task, doc and so on.)'; +$lang->admin->flowList['zentaostory'] = 'Only story(including product, story, plan, release, doc and so on.)'; $lang->admin->flowNotice = "You can remove testing, task or story extension in admin->extension panel to use all features again."; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 9ec3ce5651..fd5e9e7b1e 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -58,9 +58,9 @@ $lang->admin->bind->success = "关联账户成功"; $lang->admin->selectFlow = '您计划如何使用禅道?'; -$lang->admin->flowList['full'] = '所有功能(包括产品、项目、需求、计划、发布、任务、Bug、用例、测试任务和文档等功能。)'; -$lang->admin->flowList['onlyTest'] = '仅测试管理(包括产品、版本、Bug、用例、测试任务和文档管理等功能。)'; -$lang->admin->flowList['onlyTask'] = '仅任务管理(包括项目、任务和文档管理。)'; -$lang->admin->flowList['onlyStory'] = '仅需求管理(包括产品、需求、计划、发布和文档管理等功能。)'; +$lang->admin->flowList['full'] = '所有功能(包括产品、项目、需求、计划、发布、任务、Bug、用例、测试任务和文档等功能。)'; +$lang->admin->flowList['zentaotest'] = '仅测试管理(包括产品、版本、Bug、用例、测试任务和文档管理等功能。)'; +$lang->admin->flowList['zentaotask'] = '仅任务管理(包括项目、任务和文档管理。)'; +$lang->admin->flowList['zentaostory'] = '仅需求管理(包括产品、需求、计划、发布和文档管理等功能。)'; $lang->admin->flowNotice = "注:如果您使用的不是所有功能,后续可以到“管理->插件”中,卸载相应的插件,即可重新使用禅道所有功能。"; diff --git a/module/bug/ext/config/.gitkeep b/module/bug/ext/config/.gitkeep old mode 100644 new mode 100755 diff --git a/module/bug/ext/lang/zh-cn/.gitkeep b/module/bug/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/bug/ext/model/.gitkeep b/module/bug/ext/model/.gitkeep old mode 100644 new mode 100755 diff --git a/module/bug/ext/view/.gitkeep b/module/bug/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/build/ext/control/.gitkeep b/module/build/ext/control/.gitkeep old mode 100644 new mode 100755 diff --git a/module/build/ext/lang/en/.gitkeep b/module/build/ext/lang/en/.gitkeep old mode 100644 new mode 100755 diff --git a/module/build/ext/lang/zh-cn/.gitkeep b/module/build/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/build/ext/model/.gitkeep b/module/build/ext/model/.gitkeep old mode 100644 new mode 100755 diff --git a/module/build/ext/view/.gitkeep b/module/build/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/common/ext/lang/en/.gitkeep b/module/common/ext/lang/en/.gitkeep old mode 100644 new mode 100755 diff --git a/module/common/ext/lang/zh-cn/.gitkeep b/module/common/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/doc/ext/lang/en/.gitkeep b/module/doc/ext/lang/en/.gitkeep old mode 100644 new mode 100755 diff --git a/module/doc/ext/lang/zh-cn/.gitkeep b/module/doc/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/group/ext/lang/en/.gitkeep b/module/group/ext/lang/en/.gitkeep old mode 100644 new mode 100755 diff --git a/module/group/ext/lang/zh-cn/.gitkeep b/module/group/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/my/ext/config/.gitkeep b/module/my/ext/config/.gitkeep old mode 100644 new mode 100755 diff --git a/module/my/ext/control/.gitkeep b/module/my/ext/control/.gitkeep old mode 100644 new mode 100755 diff --git a/module/my/ext/lang/en/.gitkeep b/module/my/ext/lang/en/.gitkeep old mode 100644 new mode 100755 diff --git a/module/my/ext/lang/zh-cn/.gitkeep b/module/my/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/my/ext/view/.gitkeep b/module/my/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/product/ext/control/.gitkeep b/module/product/ext/control/.gitkeep old mode 100644 new mode 100755 diff --git a/module/product/ext/lang/en/.gitkeep b/module/product/ext/lang/en/.gitkeep old mode 100644 new mode 100755 diff --git a/module/product/ext/lang/zh-cn/.gitkeep b/module/product/ext/lang/zh-cn/.gitkeep old mode 100644 new mode 100755 diff --git a/module/product/ext/model/.gitkeep b/module/product/ext/model/.gitkeep old mode 100644 new mode 100755 diff --git a/module/product/ext/view/.gitkeep b/module/product/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/testcase/ext/view/.gitkeep b/module/testcase/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/testtask/ext/view/.gitkeep b/module/testtask/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/tree/ext/view/.gitkeep b/module/tree/ext/view/.gitkeep old mode 100644 new mode 100755 diff --git a/module/user/ext/control/.gitkeep b/module/user/ext/control/.gitkeep old mode 100644 new mode 100755 diff --git a/module/user/ext/view/.gitkeep b/module/user/ext/view/.gitkeep old mode 100644 new mode 100755