Merge branch 'master' of git@github.com:easysoft/zentaopms

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'         ,

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();

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 = "<span class='red'>You can remove testing, task or story extension in admin->extension panel to use all features again.</span>";

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 = "<span class='red'>注：如果您使用的不是所有功能，后续可以到“管理->插件”中，卸载相应的插件，即可重新使用禅道所有功能。</span>";