From 1062033526d58af3f40da4789c08f2650c7e104f Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 27 Aug 2020 13:42:16 +0800 Subject: [PATCH] * Finish Task #7711. --- module/action/model.php | 6 - module/block/control.php | 8 - module/block/lang/de.php | 48 --- module/block/lang/fr.php | 48 --- module/block/lang/vi.php | 48 --- module/block/lang/zh-tw.php | 48 --- module/block/model.php | 4 - .../block/view/printassigntomeblock.html.php | 4 - .../block/view/projectstatisticblock.html.php | 2 - module/block/view/welcome.html.php | 6 - module/bug/config.php | 19 - module/bug/control.php | 8 - module/bug/js/browse.js | 39 --- module/bug/js/common.js | 1 - module/bug/model.php | 31 +- module/bug/view/browse.html.php | 7 - module/bug/view/create.html.php | 6 +- module/bug/view/edit.html.php | 4 - module/bug/view/view.html.php | 8 +- module/build/control.php | 189 ++++------ module/build/js/view.js | 41 +-- module/build/model.php | 3 - module/build/view/edit.html.php | 2 - module/build/view/view.html.php | 29 -- module/caselib/model.php | 18 - module/caselib/view/browse.html.php | 9 - module/common/lang/de.php | 240 ------------- module/common/lang/en.php | 323 ----------------- module/common/lang/fr.php | 240 ------------- module/common/lang/vi.php | 240 ------------- module/common/lang/zh-cn.php | 324 ------------------ module/common/lang/zh-tw.php | 240 ------------- module/common/model.php | 29 +- module/company/view/dynamic.html.php | 2 - module/custom/control.php | 3 - module/custom/lang/vi.php | 3 - module/custom/lang/zh-tw.php | 3 - module/custom/view/ajaxmenu.html.php | 2 - module/doc/lang/de.php | 6 - module/doc/lang/en.php | 6 - module/doc/lang/fr.php | 6 - module/doc/lang/vi.php | 6 - module/doc/lang/zh-cn.php | 6 - module/doc/lang/zh-tw.php | 6 - module/doc/model.php | 68 +--- module/doc/view/side.html.php | 4 - module/group/lang/resource.php | 97 ------ module/install/lang/de.php | 3 - module/install/lang/en.php | 3 - module/install/lang/fr.php | 3 - module/install/lang/vi.php | 3 - module/install/lang/zh-cn.php | 3 - module/install/lang/zh-tw.php | 3 - module/issue/view/createbug.html.php | 7 +- module/issue/view/createtask.html.php | 4 +- module/my/view/requirement.html.php | 2 +- module/my/view/story.html.php | 2 +- module/product/control.php | 2 - module/product/model.php | 2 - module/product/view/create.html.php | 2 +- module/product/view/edit.html.php | 2 +- module/product/view/view.html.php | 2 - module/productplan/view/browse.html.php | 2 +- module/productplan/view/view.html.php | 2 - module/project/control.php | 3 +- module/project/lang/de.php | 7 - module/project/lang/en.php | 7 - module/project/lang/fr.php | 7 - module/project/lang/vi.php | 7 - module/project/lang/zh-cn.php | 7 - module/project/lang/zh-tw.php | 7 - module/project/model.php | 2 - module/project/view/create.html.php | 4 +- module/project/view/edit.html.php | 11 +- module/project/view/tips.html.php | 2 +- module/project/view/treestory.html.php | 76 ++-- module/project/view/view.html.php | 4 - module/release/view/browse.html.php | 2 +- module/release/view/view.html.php | 4 +- module/story/model.php | 2 +- module/story/view/view.html.php | 12 +- module/task/config.php | 8 - module/task/control.php | 7 - module/task/view/batchcreate.html.php | 4 +- module/task/view/create.html.php | 12 +- module/task/view/edit.html.php | 2 +- module/task/view/view.html.php | 2 +- module/testcase/control.php | 1 - module/testcase/js/browse.js | 17 - module/testcase/model.php | 61 +--- module/testcase/view/caseheader.html.php | 1 - module/testcase/view/create.html.php | 2 +- module/testcase/view/edit.html.php | 2 +- module/testcase/view/view.html.php | 2 +- module/testreport/model.php | 30 +- module/testreport/view/browse.html.php | 4 - module/testreport/view/create.html.php | 4 +- module/testreport/view/edit.html.php | 4 +- module/testreport/view/view.html.php | 2 +- module/testsuite/js/browse.js | 8 - module/testsuite/view/browse.html.php | 2 - module/testtask/js/browse.js | 8 - module/testtask/model.php | 201 +++-------- module/testtask/view/browse.html.php | 6 - module/testtask/view/browseunits.html.php | 4 - module/testtask/view/caseheader.html.php | 2 +- module/testtask/view/create.html.php | 2 - module/testtask/view/edit.html.php | 2 - .../testtask/view/importunitresult.html.php | 2 - module/testtask/view/view.html.php | 2 - module/todo/lang/de.php | 4 - module/todo/lang/en.php | 4 - module/todo/lang/fr.php | 4 - module/todo/lang/vi.php | 4 - module/todo/lang/zh-cn.php | 4 - module/todo/lang/zh-tw.php | 4 - module/todo/model.php | 4 - module/tree/control.php | 6 +- module/user/control.php | 3 - 119 files changed, 251 insertions(+), 2891 deletions(-) delete mode 100644 module/testsuite/js/browse.js diff --git a/module/action/model.php b/module/action/model.php index 9ad34a1a44..1a9d29fa48 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -659,9 +659,6 @@ class actionModel extends model ->beginIF($projectID == 'all' or $productID == 'all')->andWhere("IF((objectType!= 'doc' && objectType!= 'doclib'), ($condition), '1=1')")->fi() ->beginIF($docs and !$this->app->user->admin)->andWhere("IF(objectType != 'doc', '1=1', objectID " . helper::dbIN($docs) . ")")->fi() ->beginIF($libs and !$this->app->user->admin)->andWhere("IF(objectType != 'doclib', '1=1', objectID " . helper::dbIN(array_keys($libs)) . ') ')->fi() - ->beginIF($this->config->global->flow == 'onlyStory')->andWhere('objectType')->notin('bug,build,project,task,taskcase,testreport,testsuite,testtask')->fi() - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('objectType')->notin('product,productplan,release,story,testcase,testreport,testsuite')->fi() - ->beginIF($this->config->global->flow == 'onlyTest')->andWhere('objectType')->notin('project,productplan,release,story,task')->fi() ->beginIF(!empty($actionCondition))->andWhere("($actionCondition)")->fi() ->orderBy($orderBy) ->page($pager) @@ -774,9 +771,6 @@ class actionModel extends model return $actions = $this->dao->select('*')->from(TABLE_ACTION) ->where($sql) ->beginIF(!empty($actionCondition))->andWhere("($actionCondition)")->fi() - ->beginIF($this->config->global->flow == 'onlyStory')->andWhere('objectType')->notin('bug,build,project,task,taskcase,testreport,testsuite,testtask')->fi() - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('objectType')->notin('product,productplan,release,story,testcase,testreport,testsuite')->fi() - ->beginIF($this->config->global->flow == 'onlyTest')->andWhere('objectType')->notin('project,productplan,release,story,task')->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll(); diff --git a/module/block/control.php b/module/block/control.php index e8799b10e2..3fc35121d6 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -49,10 +49,6 @@ class block extends control if(!common::hasPriv($moduleKey, 'index')) unset($modules[$moduleKey]); } - if($this->config->global->flow == 'onlyTask' or $this->config->global->flow == 'onlyStory') unset($modules['qa']); - if($this->config->global->flow == 'onlyTask' or $this->config->global->flow == 'onlyTest') unset($modules['product']); - if($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') unset($modules['project']); - $closedBlock = isset($this->config->block->closed) ? $this->config->block->closed : ''; if(strpos(",$closedBlock,", ",|assigntome,") === false) $modules['assigntome'] = $this->lang->block->assignToMe; if(strpos(",$closedBlock,", ",|dynamic,") === false) $modules['dynamic'] = $this->lang->block->dynamic; @@ -227,10 +223,6 @@ class block extends control continue; } - if($this->config->global->flow == 'onlyStory' and $block->source != 'product' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]); - if($this->config->global->flow == 'onlyTask' and $block->source != 'project' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]); - if($this->config->global->flow == 'onlyTest' and $block->source != 'qa' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]); - $block->params = json_decode($block->params); $blockID = $block->block; $source = empty($block->source) ? 'common' : $block->source; diff --git a/module/block/lang/de.php b/module/block/lang/de.php index d106089dfa..7bd7dd812c 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -187,54 +187,6 @@ $lang->block->default['full']['my']['8']['source'] = 'product'; $lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['9']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; -$lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTest']['my']['2']['title'] = 'Verlauf'; -$lang->block->default['onlyTest']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTest']['my']['2']['grid'] = 4; -$lang->block->default['onlyTest']['my']['2']['source'] = ''; -$lang->block->default['onlyTest']['my']['3']['title'] = 'Meine Todos'; -$lang->block->default['onlyTest']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTest']['my']['3']['grid'] = 6; -$lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2']; -$lang->block->default['onlyTest']['my']['4']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['4']['grid'] = 6; - -$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyStory']['my']['1']['source'] = 'project'; -$lang->block->default['onlyStory']['my']['1']['grid'] = 8; -$lang->block->default['onlyStory']['my']['2']['title'] = 'Verlauf'; -$lang->block->default['onlyStory']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyStory']['my']['2']['grid'] = 4; -$lang->block->default['onlyStory']['my']['2']['source'] = ''; -$lang->block->default['onlyStory']['my']['3']['title'] = 'Meine Todos'; -$lang->block->default['onlyStory']['my']['3']['block'] = 'list'; -$lang->block->default['onlyStory']['my']['3']['grid'] = 6; -$lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2']; -$lang->block->default['onlyStory']['my']['4']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['4']['grid'] = 6; - -$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyTask']['my']['1']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['1']['grid'] = 8; -$lang->block->default['onlyTask']['my']['2']['title'] = 'Verlauf'; -$lang->block->default['onlyTask']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTask']['my']['2']['grid'] = 4; -$lang->block->default['onlyTask']['my']['2']['source'] = ''; -$lang->block->default['onlyTask']['my']['3']['title'] = 'Meine Todos'; -$lang->block->default['onlyTask']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTask']['my']['3']['grid'] = 6; -$lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2']; -$lang->block->default['onlyTask']['my']['4']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['4']['grid'] = 6; - $lang->block->num = 'Number'; $lang->block->type = 'Type'; $lang->block->orderBy = 'Order by'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 7c8a9d24e2..55e1be6419 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -187,54 +187,6 @@ $lang->block->default['full']['my']['8']['source'] = 'product'; $lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['9']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; -$lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTest']['my']['2']['title'] = 'Historique'; -$lang->block->default['onlyTest']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTest']['my']['2']['grid'] = 4; -$lang->block->default['onlyTest']['my']['2']['source'] = ''; -$lang->block->default['onlyTest']['my']['3']['title'] = 'Mon Agenday'; -$lang->block->default['onlyTest']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTest']['my']['3']['grid'] = 6; -$lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2']; -$lang->block->default['onlyTest']['my']['4']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['4']['grid'] = 6; - -$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyStory']['my']['1']['source'] = 'project'; -$lang->block->default['onlyStory']['my']['1']['grid'] = 8; -$lang->block->default['onlyStory']['my']['2']['title'] = 'Historique'; -$lang->block->default['onlyStory']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyStory']['my']['2']['grid'] = 4; -$lang->block->default['onlyStory']['my']['2']['source'] = ''; -$lang->block->default['onlyStory']['my']['3']['title'] = 'Mon Agenda'; -$lang->block->default['onlyStory']['my']['3']['block'] = 'list'; -$lang->block->default['onlyStory']['my']['3']['grid'] = 6; -$lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2']; -$lang->block->default['onlyStory']['my']['4']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['4']['grid'] = 6; - -$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyTask']['my']['1']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['1']['grid'] = 8; -$lang->block->default['onlyTask']['my']['2']['title'] = 'Historique'; -$lang->block->default['onlyTask']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTask']['my']['2']['grid'] = 4; -$lang->block->default['onlyTask']['my']['2']['source'] = ''; -$lang->block->default['onlyTask']['my']['3']['title'] = 'Mon Agenda'; -$lang->block->default['onlyTask']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTask']['my']['3']['grid'] = 6; -$lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2']; -$lang->block->default['onlyTask']['my']['4']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['4']['grid'] = 6; - $lang->block->num = 'Numéro'; $lang->block->type = 'Type'; $lang->block->orderBy = 'Trié par'; diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index fe3cc139ba..0de9be0cc8 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -187,54 +187,6 @@ $lang->block->default['full']['my']['8']['source'] = 'product'; $lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['9']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; -$lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTest']['my']['2']['title'] = 'Lịch sử'; -$lang->block->default['onlyTest']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTest']['my']['2']['grid'] = 4; -$lang->block->default['onlyTest']['my']['2']['source'] = ''; -$lang->block->default['onlyTest']['my']['3']['title'] = 'Việc của bạn'; -$lang->block->default['onlyTest']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTest']['my']['3']['grid'] = 6; -$lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2']; -$lang->block->default['onlyTest']['my']['4']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['4']['grid'] = 6; - -$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyStory']['my']['1']['source'] = 'project'; -$lang->block->default['onlyStory']['my']['1']['grid'] = 8; -$lang->block->default['onlyStory']['my']['2']['title'] = 'Lịch sử'; -$lang->block->default['onlyStory']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyStory']['my']['2']['grid'] = 4; -$lang->block->default['onlyStory']['my']['2']['source'] = ''; -$lang->block->default['onlyStory']['my']['3']['title'] = 'Việc của bạn'; -$lang->block->default['onlyStory']['my']['3']['block'] = 'list'; -$lang->block->default['onlyStory']['my']['3']['grid'] = 6; -$lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2']; -$lang->block->default['onlyStory']['my']['4']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['4']['grid'] = 6; - -$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyTask']['my']['1']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['1']['grid'] = 8; -$lang->block->default['onlyTask']['my']['2']['title'] = 'Lịch sử'; -$lang->block->default['onlyTask']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTask']['my']['2']['grid'] = 4; -$lang->block->default['onlyTask']['my']['2']['source'] = ''; -$lang->block->default['onlyTask']['my']['3']['title'] = 'Việc của bạn'; -$lang->block->default['onlyTask']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTask']['my']['3']['grid'] = 6; -$lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2']; -$lang->block->default['onlyTask']['my']['4']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['4']['grid'] = 6; - $lang->block->num = 'Số'; $lang->block->type = 'Loại'; $lang->block->orderBy = 'Order by'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 4ef38040ce..8564e7dd91 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -187,54 +187,6 @@ $lang->block->default['full']['my']['8']['source'] = 'product'; $lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['9']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; -$lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTest']['my']['2']['title'] = '最新動態'; -$lang->block->default['onlyTest']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTest']['my']['2']['grid'] = 4; -$lang->block->default['onlyTest']['my']['2']['source'] = ''; -$lang->block->default['onlyTest']['my']['3']['title'] = '我的待辦'; -$lang->block->default['onlyTest']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTest']['my']['3']['grid'] = 6; -$lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2']; -$lang->block->default['onlyTest']['my']['4']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['4']['grid'] = '6'; - -$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['product']['1']; -$lang->block->default['onlyStory']['my']['1']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['1']['grid'] = '8'; -$lang->block->default['onlyStory']['my']['2']['title'] = '最新動態'; -$lang->block->default['onlyStory']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyStory']['my']['2']['grid'] = 4; -$lang->block->default['onlyStory']['my']['2']['source'] = ''; -$lang->block->default['onlyStory']['my']['3']['title'] = '我的待辦'; -$lang->block->default['onlyStory']['my']['3']['block'] = 'list'; -$lang->block->default['onlyStory']['my']['3']['grid'] = 6; -$lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2']; -$lang->block->default['onlyStory']['my']['4']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['4']['grid'] = '4'; - -$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyTask']['my']['1']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTask']['my']['2']['title'] = '最新動態'; -$lang->block->default['onlyTask']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTask']['my']['2']['grid'] = 4; -$lang->block->default['onlyTask']['my']['2']['source'] = ''; -$lang->block->default['onlyTask']['my']['3']['title'] = '我的待辦'; -$lang->block->default['onlyTask']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTask']['my']['3']['grid'] = 6; -$lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2']; -$lang->block->default['onlyTask']['my']['4']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['4']['grid'] = 6; - $lang->block->num = '數量'; $lang->block->type = '類型'; $lang->block->orderBy = '排序'; diff --git a/module/block/model.php b/module/block/model.php index f4e3baa884..c3219e2b3c 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -137,10 +137,6 @@ class blockModel extends model ->andWhere('module')->eq($module) ->andWhere('hidden')->eq(0) ->beginIF($type)->andWhere('type')->eq($type)->fi() - ->beginIF($this->config->global->flow != 'full')->andWhere('block')->notin('flowchart')->fi() - ->beginIF($this->config->global->flow == 'onlyStory')->andWhere('source')->notin('project,qa')->fi() - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('source')->notin('product,qa')->fi() - ->beginIF($this->config->global->flow == 'onlyTest')->andWhere('source')->notin('product,project')->fi() ->orderBy('`order`') ->fetchAll('id'); diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php index 9085b18ead..a33823cb43 100644 --- a/module/block/view/printassigntomeblock.html.php +++ b/module/block/view/printassigntomeblock.html.php @@ -14,8 +14,6 @@ '; } - if($config->global->flow != 'onlyTest' && $currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active'; + if($currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active'; $subMenu .= "
  • " . html::a($subLink, $subLabel) . $subProgram . '
    • '; } @@ -681,12 +672,7 @@ class commonModel extends model { $searchObject = $methodName; } - if(empty($lang->searchObjects[$searchObject])) - { - $searchObject = 'bug'; - if($config->global->flow == 'onlyStory') $searchObject = 'story'; - if($config->global->flow == 'onlyTask') $searchObject = 'task'; - } + if(empty($lang->searchObjects[$searchObject])) $searchObject = 'bug'; echo " diff --git a/module/custom/control.php b/module/custom/control.php index 107b253ff7..6daf926ea6 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -555,9 +555,6 @@ class custom extends control public function ajaxGetMenu($module = 'main', $method = '', $type = '') { if($this->config->global->flow == 'full') $this->loadModel('project')->setMenu(array(), 0); - if($this->config->global->flow == 'onlyTest') $this->loadModel('testcase')->setMenu(array(), 0); - if($this->config->global->flow == 'onlyTest') $this->loadModel('bug')->setMenu(array(), 0); - if($this->config->global->flow == 'onlyTask') $this->loadModel('project')->setMenu(array(), 0); if($type === 'all') { $menu = array(); diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 07b2a984c1..ebbe49bd0f 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -134,9 +134,6 @@ $lang->custom->productProject->relation['1_2'] = 'Dự án - Sprint'; $lang->custom->productProject->notice = 'Chọn một mô hình phù hợp với doanh nghiệp của bạn.'; $lang->custom->workingList['full'] = 'Quản lý vòng đời ứng dụng'; -$lang->custom->workingList['onlyTest'] = 'Quản lý kiểm thử'; -$lang->custom->workingList['onlyStory'] = 'Quản lý câu chuyện'; -$lang->custom->workingList['onlyTask'] = 'Quản lý nhiệm vụ'; $lang->custom->menuTip = 'Click để hiện/ẩn menu. Kéo thả để chuyển vị trí hiển thị.'; $lang->custom->saveFail = 'Lưu thất bại!'; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 5c1bcd16c4..e90de2f3a8 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -134,9 +134,6 @@ $lang->custom->productProject->relation['1_2'] = '項目 - 衝刺'; $lang->custom->productProject->notice = '請根據實際情況選擇適合自己團隊的概念。'; $lang->custom->workingList['full'] = '完整研發管理工具'; -$lang->custom->workingList['onlyTest'] = '測試管理工具'; -$lang->custom->workingList['onlyStory'] = "{$lang->storyCommon}管理工具"; -$lang->custom->workingList['onlyTask'] = '任務管理工具'; $lang->custom->menuTip = '點擊顯示或隱藏導航條目，拖拽來更改顯示順序。'; $lang->custom->saveFail = '保存失敗！'; diff --git a/module/custom/view/ajaxmenu.html.php b/module/custom/view/ajaxmenu.html.php index a5cb92cae6..3b596b6794 100644 --- a/module/custom/view/ajaxmenu.html.php +++ b/module/custom/view/ajaxmenu.html.php @@ -27,11 +27,9 @@ - global->flow != 'onlyTest'):?> -
    diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index c971aec9e2..519a6ee4c8 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -109,12 +109,6 @@ $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon . 'Dok Bibliothek'; $lang->doc->systemLibs['project'] = $lang->projectCommon . 'Dok Bibliothek'; -global $config; -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']); -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']); -if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']); -if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']); - $lang->doc->aclList['open'] = 'Öffentlich'; $lang->doc->aclList['custom'] = 'Eigene'; $lang->doc->aclList['private'] = 'Privat'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 6489696f55..3f9cd7eeb9 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -109,12 +109,6 @@ $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; $lang->doc->systemLibs['project'] = $lang->projectCommon; -global $config; -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']); -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']); -if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']); -if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']); - $lang->doc->aclList['open'] = 'Public'; $lang->doc->aclList['custom'] = 'Custom'; $lang->doc->aclList['private'] = 'Private'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index e5a30df8b5..f9c3da8b68 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -109,12 +109,6 @@ $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; $lang->doc->systemLibs['project'] = $lang->projectCommon; -global $config; -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']); -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']); -if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']); -if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']); - $lang->doc->aclList['open'] = 'Public'; $lang->doc->aclList['custom'] = 'Person.'; $lang->doc->aclList['private'] = 'Privé'; diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php index d3ea1fd8d5..328d133150 100644 --- a/module/doc/lang/vi.php +++ b/module/doc/lang/vi.php @@ -109,12 +109,6 @@ $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; $lang->doc->systemLibs['project'] = $lang->projectCommon; -global $config; -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']); -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']); -if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']); -if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']); - $lang->doc->aclList['open'] = 'Công khai'; $lang->doc->aclList['custom'] = 'Tùy biến'; $lang->doc->aclList['private'] = 'Riêng tư'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 80bd9b4e93..07282e9b8c 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -109,12 +109,6 @@ $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; $lang->doc->systemLibs['project'] = $lang->projectCommon; -global $config; -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']); -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']); -if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']); -if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']); - $lang->doc->aclList['open'] = '公开'; $lang->doc->aclList['custom'] = '自定义'; $lang->doc->aclList['private'] = '私有'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index dc51309549..f1e5c26260 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -109,12 +109,6 @@ $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; $lang->doc->systemLibs['project'] = $lang->projectCommon; -global $config; -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']); -if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->libTypeList['project']); -if($config->global->flow == 'onlyTask') unset($lang->doc->systemLibs['product']); -if($config->global->flow == 'onlyTask') unset($lang->doc->libTypeList['product']); - $lang->doc->aclList['open'] = '公開'; $lang->doc->aclList['custom'] = '自定義'; $lang->doc->aclList['private'] = '私有'; diff --git a/module/doc/model.php b/module/doc/model.php index 51b25239c9..6a1621cb47 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -324,8 +324,6 @@ class docModel extends model { $docs = $this->dao->select('*')->from(TABLE_DOC) ->where('deleted')->eq(0) - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('product')->eq(0)->fi() - ->beginIF($this->config->global->flow == 'onlyStory' || $this->config->global->flow == 'onlyTest')->andWhere('project')->eq(0)->fi() ->beginIF($libID)->andWhere('lib')->in($libID)->fi() ->andWhere('lib')->in($allLibs) ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi() @@ -338,8 +336,6 @@ class docModel extends model { $docs = $this->dao->select('*')->from(TABLE_DOC) ->where('deleted')->eq(0) - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('product')->eq(0)->fi() - ->beginIF($this->config->global->flow == 'onlyStory' || $this->config->global->flow == 'onlyTest')->andWhere('project')->eq(0)->fi() ->andWhere('id')->in($docIdList) ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi() ->andWhere('lib')->in($allLibs) @@ -351,8 +347,6 @@ class docModel extends model { $docs = $this->dao->select('*')->from(TABLE_DOC) ->where('deleted')->eq(0) - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('product')->eq(0)->fi() - ->beginIF($this->config->global->flow == 'onlyStory' || $this->config->global->flow == 'onlyTest')->andWhere('project')->eq(0)->fi() ->beginIF($libID)->andWhere('lib')->in($libID)->fi() ->andWhere('lib')->in($allLibs) ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi() @@ -425,8 +419,6 @@ class docModel extends model $docs = $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1') ->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t2.doc = t1.id') ->where('t1.deleted')->eq(0) - ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('product')->eq(0)->fi() - ->beginIF($this->config->global->flow == 'onlyStory' || $this->config->global->flow == 'onlyTest')->andWhere('project')->eq(0)->fi() ->beginIF(!empty($docIdList))->andWhere('t1.id')->in($docIdList)->fi() ->andWhere('t1.title', true)->like("%{$this->session->searchDoc}%") ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi() @@ -1034,18 +1026,11 @@ class docModel extends model $productIdList = array_keys($productLibs); $products = $this->dao->select('id,name,status')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->andWhere('deleted')->eq('0')->orderBy('`order`_desc')->fetchAll(); - if($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') - { - $hasProject = array(); - } - else - { - $hasProject = $this->dao->select('DISTINCT t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') - ->where('t1.product')->in($productIdList) - ->andWhere('t2.deleted')->eq(0) - ->fetchPairs('product', 'product'); - } + $hasProject = $this->dao->select('DISTINCT t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->in($productIdList) + ->andWhere('t2.deleted')->eq(0) + ->fetchPairs('product', 'product'); $hasLibsPriv = common::hasPriv('doc', 'allLibs'); $hasFilesPriv = common::hasPriv('doc', 'showFiles'); @@ -1099,9 +1084,6 @@ class docModel extends model */ public function getLimitLibs($type, $limit = 0) { - if($type == 'project' and ($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest')) return array(); - if($type == 'product' and $this->config->global->flow == 'onlyTask') return array(); - if($type == 'product' or $type == 'project') { $nonzeroLibs = array(); @@ -1157,19 +1139,12 @@ class docModel extends model $libGroups = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere($type)->in($idList)->orderBy('`order`, id')->fetchGroup($type, 'id'); if($type == 'product') { - if($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') - { - $hasProject = array(); - } - else - { - $hasProject = $this->dao->select('DISTINCT t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') - ->where('t1.product')->in($idList) - ->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi() - ->andWhere('t2.deleted')->eq(0) - ->fetchPairs('product', 'product'); - } + $hasProject = $this->dao->select('DISTINCT t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->in($idList) + ->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi() + ->andWhere('t2.deleted')->eq(0) + ->fetchPairs('product', 'product'); } $buildGroups = array(); foreach($libGroups as $objectID => $libs) @@ -1198,20 +1173,13 @@ class docModel extends model $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere($type)->eq($objectID)->orderBy('`order`, id')->fetchAll('id'); if($type == 'product') { - if($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') - { - $hasProject = array(); - } - else - { - $hasProject = $this->dao->select('DISTINCT t1.product, count(project) as projectCount')->from(TABLE_PROJECTPRODUCT)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') - ->where('t1.product')->eq($objectID) - ->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi() - ->andWhere('t2.deleted')->eq(0) - ->groupBy('product') - ->fetchPairs('product', 'projectCount'); - } + $hasProject = $this->dao->select('DISTINCT t1.product, count(project) as projectCount')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->eq($objectID) + ->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi() + ->andWhere('t2.deleted')->eq(0) + ->groupBy('product') + ->fetchPairs('product', 'projectCount'); } $libs = array(); diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 9f670f9955..2dbf572ce4 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -19,16 +19,12 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
    doclib->tabList as $tabValue => $tabName):?> - config->global->flow == 'onlyTask' and $tabValue == 'product') continue;?> - config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') and $tabValue == 'project') continue;?>
    ">
      diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e34c9405ae..9399ce9066 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1705,100 +1705,3 @@ $lang->changelog['12.3'][] = 'testtask-unitCases'; $lang->changelog['12.3'][] = 'testtask-importUnitResult'; $lang->changelog['12.3'][] = 'job-view'; $lang->changelog['12.3'][] = 'ci-commitResult'; - -global $config; -if($config->global->flow != 'full') -{ - unset($lang->moduleOrder[10]); - unset($lang->resource->qa); - unset($lang->moduleOrder[50]); - unset($lang->resource->report); - unset($lang->moduleOrder[90]); -} - -if($config->global->flow == 'onlyStory' || $config->global->flow == 'onlyTask') -{ - unset($lang->resource->build); - unset($lang->moduleOrder[45]); - unset($lang->resource->bug); - unset($lang->moduleOrder[55]); - unset($lang->resource->testcase); - unset($lang->moduleOrder[60]); - unset($lang->resource->testtask); - unset($lang->moduleOrder[65]); - - unset($lang->resource->my->bug); - unset($lang->resource->my->testTask); - unset($lang->resource->my->testCase); -} - -if($config->global->flow == 'onlyStory' || $config->global->flow == 'onlyTest') -{ - unset($lang->resource->project); - unset($lang->moduleOrder[35]); - unset($lang->resource->task); - unset($lang->moduleOrder[40]); - - unset($lang->resource->my->task); - unset($lang->resource->my->project); - - unset($lang->resource->product->project); -} - -if($config->global->flow == 'onlyTask' || $config->global->flow == 'onlyTest') -{ - unset($lang->resource->story); - unset($lang->moduleOrder[20]); - unset($lang->resource->productplan); - unset($lang->moduleOrder[25]); - unset($lang->resource->release); - unset($lang->moduleOrder[30]); - - unset($lang->resource->my->story); -} - -if($config->global->flow == 'onlyStory') -{ - unset($lang->resource->svn); - unset($lang->moduleOrder[150]); - unset($lang->resource->git); - unset($lang->moduleOrder[155]); - - unset($lang->resource->story->tasks); -} - -if($config->global->flow == 'onlyTask') -{ - unset($lang->resource->product); - unset($lang->moduleOrder[15]); - unset($lang->resource->bug); - unset($lang->moduleOrder[55]); - - unset($lang->resource->project->importbug); - unset($lang->resource->project->story); - unset($lang->resource->project->bug); - unset($lang->resource->project->linkStory); - unset($lang->resource->project->unlinkStory); - unset($lang->resource->project->ajaxGetProducts); -} - -if($config->global->flow == 'onlyTest') -{ - unset($lang->resource->product->browse); - unset($lang->resource->product->roadmap); - unset($lang->resource->product->dynamic); - unset($lang->resource->product->ajaxGetProjects); - unset($lang->resource->product->ajaxGetPlans); - - unset($lang->resource->build->ajaxGetProjectBuilds); - unset($lang->build->methodOrder[30]); - - unset($lang->resource->bug->confirmStoryChange); - unset($lang->bug->methodOrder[60]); - - unset($lang->resource->testcase->confirmStoryChange); - unset($lang->testcase->methodOrder[40]); - - $lang->resource->product->build = 'build'; - $lang->product->methodOrder[5] = 'build'; -} diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 69046aaa21..2e96973285 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -107,9 +107,6 @@ $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; $lang->install->workingList['full'] = 'Volles Development Management'; -$lang->install->workingList['onlyTest'] = 'Nur Test Management'; -$lang->install->workingList['onlyStory'] = 'Nur Story Management'; -$lang->install->workingList['onlyTask'] = 'Nur Task Management'; $lang->install->errorConnectDB = 'Verbindung zur Datenbank fehlgeschlagen. '; $lang->install->errorDBName = 'Datenbankname darf keinen Punkt enthalten'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index f7a1382ec9..a939ade245 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -107,9 +107,6 @@ $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; $lang->install->workingList['full'] = 'Application Lifecycle Management'; -$lang->install->workingList['onlyTest'] = 'Only Test Management'; -$lang->install->workingList['onlyStory'] = 'Only Story Management'; -$lang->install->workingList['onlyTask'] = 'Only Task Management'; $lang->install->errorConnectDB = 'Connection to the database Failed. '; $lang->install->errorDBName = 'Database name should exclude “.” '; diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index afe2f21325..2fd31caa70 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -107,9 +107,6 @@ $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; $lang->install->workingList['full'] = 'Application Lifecycle Management'; -$lang->install->workingList['onlyTest'] = 'Seulement Test Management'; -$lang->install->workingList['onlyStory'] = 'Seulement Story Management'; -$lang->install->workingList['onlyTask'] = 'Seulement Task Management'; $lang->install->errorConnectDB = 'Echec de connexion à la base. '; $lang->install->errorDBName = 'Le nom de la base ne doit pas contenir de “.” '; diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php index ec5fb82fac..739cfaca46 100644 --- a/module/install/lang/vi.php +++ b/module/install/lang/vi.php @@ -107,9 +107,6 @@ $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; $lang->install->workingList['full'] = 'Quản lý vòng đời ứng dụng'; -$lang->install->workingList['onlyTest'] = 'Chỉ Test Management'; -$lang->install->workingList['onlyStory'] = 'Chỉ Story Management'; -$lang->install->workingList['onlyTask'] = 'Chỉ Task Management'; $lang->install->errorConnectDB = 'Connection to the database Failed. '; $lang->install->errorDBName = 'Database name should exclude “.” '; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index ce0c78b080..461882c16a 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -107,9 +107,6 @@ $lang->install->requestTypes['GET'] = '普通方式'; $lang->install->requestTypes['PATH_INFO'] = '静态友好方式'; $lang->install->workingList['full'] = '完整研发管理工具'; -$lang->install->workingList['onlyTest'] = '测试管理工具'; -$lang->install->workingList['onlyStory'] = "需求管理工具"; -$lang->install->workingList['onlyTask'] = '任务管理工具'; $lang->install->errorConnectDB = '数据库连接失败 '; $lang->install->errorDBName = '数据库名不能含有 “.” '; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index bc15a379fe..a45e8ce43f 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -107,9 +107,6 @@ $lang->install->requestTypes['GET'] = '普通方式'; $lang->install->requestTypes['PATH_INFO'] = '靜態友好方式'; $lang->install->workingList['full'] = '完整研發管理工具'; -$lang->install->workingList['onlyTest'] = '測試管理工具'; -$lang->install->workingList['onlyStory'] = "需求管理工具"; -$lang->install->workingList['onlyTask'] = '任務管理工具'; $lang->install->errorConnectDB = '資料庫連接失敗 '; $lang->install->errorDBName = '資料庫名不能含有 “.” '; diff --git a/module/issue/view/createbug.html.php b/module/issue/view/createbug.html.php index 6b1049e56a..2b7e8e10a1 100644 --- a/module/issue/view/createbug.html.php +++ b/module/issue/view/createbug.html.php @@ -25,7 +25,7 @@
    - global->flow != 'onlyTest');?> + bug->project : $lang->bug->type;?> @@ -76,7 +76,7 @@ - config->global->flow != 'onlyTest' && $showProject):?> + @@ -188,7 +188,7 @@ $showStory = strpos(",$showFields,", ',story,') !== false; $showTask = strpos(",$showFields,", ',task,') !== false; ?> - config->global->flow != 'onlyTest'):?> + bug->story : $lang->bug->task;?> @@ -699,7 +699,6 @@ function notice() var branch = $('#branch').val(); if(typeof(branch) == 'undefined') branch = 0; var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch); - if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val()); html += '' + createBuild + ' '; html += '' + refresh + ''; } diff --git a/module/issue/view/createtask.html.php b/module/issue/view/createtask.html.php index f69d862c13..2eaee6ee1b 100644 --- a/module/issue/view/createtask.html.php +++ b/module/issue/view/createtask.html.php @@ -41,7 +41,7 @@ task->status;?> - global->flow != 'onlyTask' and $project->type != 'ops'):?> + type != 'ops'):?> task->selectTestStory;?> @@ -97,10 +97,8 @@
    name, "class='form-control'");?> - global->flow != 'onlyTask'):?> task->copyStoryTitle;?> -
    task->pri;?> diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php index 8bb58416a1..40413b7e4d 100644 --- a/module/my/view/requirement.html.php +++ b/module/my/view/requirement.html.php @@ -84,7 +84,7 @@ common::printIcon('story', 'review', $vars, $story, 'list', 'glasses', '', '', '', '', '', $story->program); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true, '', '', $story->program); common::printIcon('story', 'edit', $vars, $story, 'list', '', '', '', '', '', '', $story->program); - if($config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', '', '', '', $story->program); + common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', '', '', '', $story->program); ?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index d29c86ea3a..88b31b9b38 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -90,7 +90,7 @@ common::printIcon('story', 'review', $vars, $story, 'list', 'glasses', '', '', '', '', '', $story->program); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true, '', '', $story->program); common::printIcon('story', 'edit', $vars, $story, 'list', '', '', '', '', '', '', $story->program); - if($config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', '', '', '', $story->program); + common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', '', '', '', $story->program); ?> diff --git a/module/product/control.php b/module/product/control.php index 5a18252351..fdf45fcc32 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -49,7 +49,6 @@ class product extends control */ public function index($locate = 'auto', $productID = 0, $status = 'noclosed', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1) { - if($this->config->global->flow == 'onlyTest') $this->locate($this->createLink($this->moduleName, 'build')); if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse')); if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index); @@ -254,7 +253,6 @@ class product extends control $this->executeHooks($productID); $locate = $this->createLink($this->moduleName, 'browse', "productID=$productID"); - if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest') $locate = $this->createLink($this->moduleName, 'build', "productID=$productID"); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); } diff --git a/module/product/model.php b/module/product/model.php index a5bd12474c..3f65c7781b 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -312,8 +312,6 @@ class productModel extends model */ public function getProductsByProject($projectID) { - if($this->config->global->flow == 'onlyTask') return array(); - return $this->dao->select('t1.product, t2.name') ->from(TABLE_PROJECTPRODUCT)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2') diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index 527718b57d..a3f16d58eb 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -12,7 +12,7 @@ ?> -global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') ? true : false);?> +
    diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index e23a017dd5..1c8a038624 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -12,7 +12,7 @@ ?> -global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') ? true : false);?> +
    diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 6cb73513d8..16289a5b2a 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -190,7 +190,6 @@
    - global->flow != 'onlyTest'):?>
    product->otherInfo;?>
    @@ -231,7 +230,6 @@
    - printExtendFields($product, 'div', "position=right&inForm=0&inCell=1");?>
    diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index b42e8ff32b..b6a40c64f8 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -119,7 +119,7 @@ id"), '', '', "class='btn' title='{$lang->project->create}' data-toggle='modal' data-type='ajax'"); if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkStory}'"); - if(common::hasPriv('productplan', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkBug}'"); + if(common::hasPriv('productplan', 'linkBug')) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkBug}'"); common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list'); if(common::hasPriv('productplan', 'create')) { diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 36fc3f1c03..13585279a6 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -50,9 +50,7 @@
    diff --git a/module/project/control.php b/module/project/control.php index 30f8e4abea..5351aee25a 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -122,12 +122,11 @@ class project extends control /* Set browse type. */ $browseType = strtolower($status); - if($this->config->global->flow == 'onlyTask' and $browseType == 'byproduct') $param = 0; /* Get products by project. */ $project = $this->commonAction($projectID, $status); $projectID = $project->id; - $products = $this->config->global->flow == 'onlyTask' ? array() : $this->loadModel('product')->getProductsByProject($projectID); + $products = $this->loadModel('product')->getProductsByProject($projectID); setcookie('preProjectID', $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true); if($this->cookie->preProjectID != $projectID) diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 7e00400766..0d3a99cf37 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -354,10 +354,3 @@ $lang->project->treeLevel['all'] = 'Alle aufklappen'; $lang->project->treeLevel['root'] = 'Alle zuklappen'; $lang->project->treeLevel['task'] = 'Aufgabe anzeigen'; $lang->project->treeLevel['story'] = 'Story anzeigen'; - -global $config; -if($config->global->flow == 'onlyTask') -{ - unset($lang->project->groups['story']); - unset($lang->project->featureBar['task']['needconfirm']); -} diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 31a8675325..19a601880d 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -354,10 +354,3 @@ $lang->project->treeLevel['all'] = 'Expand All'; $lang->project->treeLevel['root'] = 'Collapse All'; $lang->project->treeLevel['task'] = 'Stories&Tasks'; $lang->project->treeLevel['story'] = 'Only Stories'; - -global $config; -if($config->global->flow == 'onlyTask') -{ - unset($lang->project->groups['story']); - unset($lang->project->featureBar['task']['needconfirm']); -} diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 0074f0e3f0..e2c23d2ad5 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -354,10 +354,3 @@ $lang->project->treeLevel['all'] = 'Déplier Tout'; $lang->project->treeLevel['root'] = 'Masquer Tout'; $lang->project->treeLevel['task'] = 'Stories&Tâches'; $lang->project->treeLevel['story'] = 'Seulement Stories'; - -global $config; -if($config->global->flow == 'onlyTask') -{ - unset($lang->project->groups['story']); - unset($lang->project->featureBar['task']['needconfirm']); -} diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php index 18ba0b23c8..0f3e76df56 100644 --- a/module/project/lang/vi.php +++ b/module/project/lang/vi.php @@ -354,10 +354,3 @@ $lang->project->treeLevel['all'] = 'Mở tất cả'; $lang->project->treeLevel['root'] = 'Co lại tất cả'; $lang->project->treeLevel['task'] = 'Câu chuyện & nhiệm vụ'; $lang->project->treeLevel['story'] = 'Chỉ câu chuyện'; - -global $config; -if($config->global->flow == 'onlyTask') -{ - unset($lang->project->groups['story']); - unset($lang->project->featureBar['task']['needconfirm']); -} diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 67c55806fe..a66a6b6442 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -360,10 +360,3 @@ $lang->project->treeLevel['all'] = '全部展开'; $lang->project->treeLevel['root'] = '全部折叠'; $lang->project->treeLevel['task'] = '全部显示'; $lang->project->treeLevel['story'] = "只看{$lang->storyCommon}"; - -global $config; -if($config->global->flow == 'onlyTask') -{ - unset($lang->project->groups['story']); - unset($lang->project->featureBar['task']['needconfirm']); -} diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 85cbdfd2eb..1576e70274 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -354,10 +354,3 @@ $lang->project->treeLevel['all'] = '全部展開'; $lang->project->treeLevel['root'] = '全部摺疊'; $lang->project->treeLevel['task'] = '全部顯示'; $lang->project->treeLevel['story'] = "只看{$lang->storyCommon}"; - -global $config; -if($config->global->flow == 'onlyTask') -{ - unset($lang->project->groups['story']); - unset($lang->project->featureBar['task']['needconfirm']); -} diff --git a/module/project/model.php b/module/project/model.php index b5bebd07da..85545c85da 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1185,8 +1185,6 @@ class projectModel extends model */ public function getProducts($projectID, $withBranch = true) { - if($this->config->global->flow == 'onlyTask') return array(); - if(defined('TUTORIAL')) { if(!$withBranch) return $this->loadModel('tutorial')->getProductPairs(); diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index c061b48a49..cb3ed2c647 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -91,7 +91,7 @@ printExtendFields('', 'table');?> - global->flow == 'onlyTask') echo "class='hidden'";?>> + project->manageProducts;?>
    @@ -116,7 +116,7 @@
    - global->flow == 'onlyTask') echo "class='hidden'";?>> + project->linkPlan;?>
    diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 444196e222..64e1397b47 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -74,12 +74,6 @@ project->status;?> project->statusList, $project->status, "class='form-control'");?> - global->flow == 'onlyTask'):?> - - project->owner;?> - PM, "class='form-control chosen'");?> - - project->owner;?> @@ -109,8 +103,7 @@
    - - global->flow == 'onlyTask') echo "class='hidden'";?>> + project->manageProducts;?>
    @@ -135,7 +128,7 @@
    - global->flow == 'onlyTask') echo "class='hidden'";?>> + project->linkPlan;?>
    diff --git a/module/project/view/tips.html.php b/module/project/view/tips.html.php index b7c7471d0c..a59aca3792 100644 --- a/module/project/view/tips.html.php +++ b/module/project/view/tips.html.php @@ -2,7 +2,7 @@

    project->afterInfo;?>

    createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam, '', "class='btn'");?> - global->flow != 'onlyTask' && $project->type != 'ops') echo html::a($this->createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory, '', "class='btn'");?> + type != 'ops') echo html::a($this->createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory, '', "class='btn'");?> createLink('task', 'create', "project=$projectID"), $lang->project->createTask, '', "class='btn'");?> createLink('project', 'task', "projectID=$projectID"), $lang->project->goback, '', "class='btn'");?>
    diff --git a/module/project/view/treestory.html.php b/module/project/view/treestory.html.php index 593fb0ba83..0af0e223ff 100644 --- a/module/project/view/treestory.html.php +++ b/module/project/view/treestory.html.php @@ -15,7 +15,7 @@ common::printIcon('story', 'review', $vars, $story, 'list', 'glasses', '', 'btn btn-info btn-icon'); common::printIcon('story', 'close', $vars, $story, 'list', 'off', '', 'btn btn-info btn-icon iframe', true); common::printIcon('story', 'edit', $vars, $story, 'list', '', '', 'btn btn-info btn-icon'); - if($config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', 'btn btn-info btn-icon'); + common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', 'btn btn-info btn-icon'); ?>
    @@ -197,7 +197,6 @@
    - global->flow != 'onlyStory'):?> @@ -242,43 +241,42 @@ - - - - - - - - - + + + + + + + +
    story->legendFromBug;?>
    story->legendLinkStories;?> - linkStories);?> - - noData;?> - -
      - extraStories[$linkStoryID])) echo '
    • ' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '
      • '; - } - ?> -
    - -
    story->legendChildStories;?> - childStories);?> - - noData;?> - -
      - extraStories[$childStoryID])) echo '
    • ' . html::a($this->createLink('story', 'view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '
      • '; - } - ?> -
    - -
    story->legendLinkStories;?> + linkStories);?> + + noData;?> + +
      + extraStories[$linkStoryID])) echo '
    • ' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '
      • '; + } + ?> +
    + +
    story->legendChildStories;?> + childStories);?> + + noData;?> + +
      + extraStories[$childStoryID])) echo '
    • ' . html::a($this->createLink('story', 'view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '
      • '; + } + ?> +
    + +
    diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index daa6b50217..74f04c0e7f 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -72,7 +72,6 @@
    - global->flow != 'onlyTask'):?> PM):?> PM]);?> @@ -93,7 +92,6 @@ RD]);?>
    RD);?> （project->RD;?>）
    - @@ -193,7 +191,6 @@

    - global->flow != 'onlyTask'):?>
    project->manageProducts;?> @@ -222,7 +219,6 @@
    -
    project->lblStats;?>
    diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 8be6493d1a..d3220e44fb 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -72,7 +72,7 @@ createLink('release', 'view', "releaseID=$release->id&type=story&link=true"), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); - if(common::hasPriv('release', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a($this->createLink('release', 'view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); + if(common::hasPriv('release', 'linkBug')) echo html::a($this->createLink('release', 'view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); if(common::hasPriv('release', 'changeStatus', $release)) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 997a4b13ae..43ad358601 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -53,12 +53,10 @@ diff --git a/module/story/model.php b/module/story/model.php index 288e2964f5..663fbf2122 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3077,7 +3077,7 @@ class storyModel extends model common::printIcon('story', 'review', $vars, $story, 'list', 'glasses'); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); common::printIcon('story', 'edit', $vars, $story, 'list'); - if($this->config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); + common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'treemap-alt', '', '', '', '', $this->lang->story->subdivide); break; } diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 264fce8101..cd42854e3f 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -186,7 +186,7 @@ common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); - if($config->global->flow != 'onlyStory' and !isonlybody() and $story->parent >= 0 and $story->type != 'requirement' and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) + if(!isonlybody() and $story->parent >= 0 and $story->type != 'requirement' and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) { $this->app->loadLang('testcase'); echo "
    "; @@ -382,9 +382,7 @@
    - global->flow != 'onlyStory'):?>
    - -
    +
    - global->flow != 'onlyStory'):?> @@ -478,7 +473,6 @@ - printExtendFields('', 'table');?> - global->flow != 'onlyTask' and $project->type != 'ops'):?> + type != 'ops'):?> - global->flow != 'onlyTask' and $project->type != 'ops'):?> + type != 'ops'):?> - global->flow == 'onlyTask' ? "class='hidden'" : '';?> id='after-tr'> + - + - global->flow != 'onlyTask' and $project->type != 'ops'):?> + type != 'ops'):?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index fb26aa037e..a2ac62462d 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -227,7 +227,7 @@ ?> - global->flow != 'onlyTask' and $project->type != 'ops'):?> + type != 'ops'):?> - global->flow != 'onlyTest'):?> + - global->flow != 'onlyTest'):?> + - global->flow != 'onlyTest'):?> + - global->flow != 'onlyTest'):?> - @@ -53,10 +51,8 @@ - global->flow != 'onlyTest'):?> project ? '#' . $report->project . $projects[$report->project] : '';?> - tasks) as $taskID) $taskName .= '#' . $taskID . $tasks[$taskID] . ' '; diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php index d2d07a40b1..b2ff7c253a 100644 --- a/module/testreport/view/create.html.php +++ b/module/testreport/view/create.html.php @@ -44,7 +44,7 @@ refresh?>global->flow != 'onlyTest' ? html::hidden('project', isset($project->id) ? $project->id : 0) : '') . html::hidden('tasks', $tasks); + echo html::hidden('product', $productIdList) . (html::hidden('project', isset($project->id) ? $project->id : 0)) . html::hidden('tasks', $tasks); echo html::hidden('objectID', $objectID) . html::hidden('objectType', $objectType); ?> @@ -67,13 +67,11 @@ - global->flow != 'onlyTest'):?> - - global->flow != 'onlyTest'):?> - - global->flow != 'onlyTest' && !empty($project)):?> + diff --git a/module/testsuite/js/browse.js b/module/testsuite/js/browse.js deleted file mode 100644 index 08f91bcbca..0000000000 --- a/module/testsuite/js/browse.js +++ /dev/null @@ -1,8 +0,0 @@ -$(document).ready(function() -{ - if(flow == 'onlyTest') - { - $('#mainmenu .nav li').removeClass('active'); - $('#mainmenu .nav li[data-id=testsuite]').addClass('active'); - } -}) diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php index 04b8db7021..06e95bb226 100644 --- a/module/testsuite/view/browse.html.php +++ b/module/testsuite/view/browse.html.php @@ -13,7 +13,6 @@ testsuite->confirmDelete)?> global->flow);?> -global->flow != 'onlyTest'):?> -
    diff --git a/module/testtask/js/browse.js b/module/testtask/js/browse.js index 9763d8f082..79cd7db965 100644 --- a/module/testtask/js/browse.js +++ b/module/testtask/js/browse.js @@ -1,11 +1,3 @@ -$(document).ready(function() -{ - if(flow == 'onlyTest') - { - $('#subNavbar > .nav > li[data-id=' + status + ']').addClass('active'); - } -}); - function changeDate(begin, end, condition) { if(begin.indexOf('-') != -1) diff --git a/module/testtask/model.php b/module/testtask/model.php index 0f98ac1f28..7441f0eb3b 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -79,38 +79,8 @@ class testtaskModel extends model $this->lang->modulePageActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { - if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); - if($this->config->global->flow != 'onlyTest') - { - $replace = ($key == 'product') ? $selectHtml : $productID; - } - else - { - if($key == 'product') - { - $replace = $selectHtml; - } - elseif($key == 'scope') - { - $scope = $this->session->testTaskVersionScope; - $status = $this->session->testTaskVersionStatus; - $viewName = $scope == 'local'? $products[$productID] : $this->lang->testtask->all; - - $replace = '
  • '; - $replace .= "{$viewName} "; - $replace .= "
      "; - $replace .= "
    • " . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=all,$status"), $this->lang->testtask->all) . "
      • "; - $replace .= "
    • " . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=local,$status"), $products[$productID]) . "
      • "; - $replace .= "
    • "; - } - else - { - $replace = array(); - $replace['productID'] = $productID; - $replace['branch'] = $branch; - $replace['scope'] = $this->session->testTaskVersionScope; - } - } + $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); + $replace = ($key == 'product') ? $selectHtml : $productID; common::setMenuVars($this->lang->testtask->menu, $key, $replace); } } @@ -172,15 +142,8 @@ class testtaskModel extends model if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass(); foreach($this->lang->testtask->menu as $key => $value) { - if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); - if($this->config->global->flow != 'onlyTest') - { - $replace = ($key == 'product') ? $selectHtml : $productID; - } - else - { - if($key == 'product') $replace = $selectHtml; - } + $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); + $replace = ($key == 'product') ? $selectHtml : $productID; common::setMenuVars($this->lang->testtask->menu, $key, $replace); } } @@ -231,46 +194,26 @@ class testtaskModel extends model public function getProductTasks($productID, $branch = 0, $orderBy = 'id_desc', $pager = null, $scopeAndStatus = array(), $beginTime = 0, $endTime = 0) { $products = $scopeAndStatus[0] == 'all' ? $this->app->user->view->products : array(); - if($this->config->global->flow == 'onlyTest') - { - return $this->dao->select("t1.*, t2.name AS productName,t4.name AS buildName, t4.branch AS branch") - ->from(TABLE_TESTTASK)->alias('t1') - ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') - ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') - ->where('t1.deleted')->eq(0) - ->andWhere('t1.auto')->ne('unit') - ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi() - ->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi() - ->beginIF($scopeAndStatus[1] == 'totalStatus')->andWhere('t1.status')->in(('blocked,doing,wait,done'))->fi() - ->beginIF($scopeAndStatus[1] != 'totalStatus')->andWhere('t1.status')->eq($scopeAndStatus[1])->fi() - ->beginIF($branch)->andWhere("t4.branch = '$branch'")->fi() - ->orderBy($orderBy) - ->page($pager) - ->fetchAll('id'); - } - else - { - return $this->dao->select("t1.*, t2.name AS productName, t3.name AS projectName, t4.name AS buildName, if(t4.name != '', t4.branch, t5.branch) AS branch") - ->from(TABLE_TESTTASK)->alias('t1') - ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') - ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id') - ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') - ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project = t5.project and t1.product = t5.product') + return $this->dao->select("t1.*, t2.name AS productName, t3.name AS projectName, t4.name AS buildName, if(t4.name != '', t4.branch, t5.branch) AS branch") + ->from(TABLE_TESTTASK)->alias('t1') + ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') + ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id') + ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') + ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project = t5.project and t1.product = t5.product') - ->where('t1.deleted')->eq(0) - ->andWhere('t1.auto')->ne('unit') - ->andWhere('t1.project')->in("0,{$this->app->user->view->projects}") //Fix bug #3260. - ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi() - ->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi() - ->beginIF($scopeAndStatus[1] == 'totalStatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi() - ->beginIF($scopeAndStatus[1] != 'totalStatus')->andWhere('t1.status')->eq($scopeAndStatus[1])->fi() - ->beginIF($branch)->andWhere("if(t4.branch, t4.branch, t5.branch) = '$branch'")->fi() - ->beginIF($beginTime)->andWhere('t1.begin')->ge($beginTime)->fi() - ->beginIF($endTime)->andWhere('t1.end')->le($endTime)->fi() - ->orderBy($orderBy) - ->page($pager) - ->fetchAll('id'); - } + ->where('t1.deleted')->eq(0) + ->andWhere('t1.auto')->ne('unit') + ->andWhere('t1.project')->in("0,{$this->app->user->view->projects}") //Fix bug #3260. + ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi() + ->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi() + ->beginIF($scopeAndStatus[1] == 'totalStatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi() + ->beginIF($scopeAndStatus[1] != 'totalStatus')->andWhere('t1.status')->eq($scopeAndStatus[1])->fi() + ->beginIF($branch)->andWhere("if(t4.branch, t4.branch, t5.branch) = '$branch'")->fi() + ->beginIF($beginTime)->andWhere('t1.begin')->ge($beginTime)->fi() + ->beginIF($endTime)->andWhere('t1.end')->le($endTime)->fi() + ->orderBy($orderBy) + ->page($pager) + ->fetchAll('id'); } /** @@ -287,41 +230,21 @@ class testtaskModel extends model { $beginAndEnd = $this->loadModel('action')->computeBeginAndEnd($browseType); if($browseType == 'newest') $orderBy = 'end_desc,' . $orderBy; - if($this->config->global->flow == 'onlyTest') - { - $tasks = $this->dao->select("t1.*, t2.name AS productName,t4.name AS buildName") - ->from(TABLE_TESTTASK)->alias('t1') - ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') - ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') - ->where('t1.deleted')->eq(0) - ->andWhere('t1.product')->eq($productID) - ->andWhere('t1.auto')->eq('unit') - ->beginIF($browseType != 'all' and $browseType != 'newest' and $beginAndEnd) - ->andWhere('t1.end')->ge($beginAndEnd['begin']) - ->andWhere('t1.end')->le($beginAndEnd['end']) - ->fi() - ->orderBy($orderBy) - ->page($pager) - ->fetchAll('id'); - } - else - { - $tasks = $this->dao->select("t1.*, t2.name AS productName, t3.name AS projectName, t4.name AS buildName") - ->from(TABLE_TESTTASK)->alias('t1') - ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') - ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id') - ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') - ->where('t1.deleted')->eq(0) - ->andWhere('t1.product')->eq($productID) - ->andWhere('t1.auto')->eq('unit') - ->beginIF($browseType != 'all' and $browseType != 'newest' and $beginAndEnd) - ->andWhere('t1.end')->ge($beginAndEnd['begin']) - ->andWhere('t1.end')->le($beginAndEnd['end']) - ->fi() - ->orderBy($orderBy) - ->page($pager) - ->fetchAll('id'); - } + $tasks = $this->dao->select("t1.*, t2.name AS productName, t3.name AS projectName, t4.name AS buildName") + ->from(TABLE_TESTTASK)->alias('t1') + ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') + ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id') + ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') + ->where('t1.deleted')->eq(0) + ->andWhere('t1.product')->eq($productID) + ->andWhere('t1.auto')->eq('unit') + ->beginIF($browseType != 'all' and $browseType != 'newest' and $beginAndEnd) + ->andWhere('t1.end')->ge($beginAndEnd['begin']) + ->andWhere('t1.end')->le($beginAndEnd['end']) + ->fi() + ->orderBy($orderBy) + ->page($pager) + ->fetchAll('id'); $resultGroups = $this->dao->select('t1.task, t2.*')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_TESTRESULT)->alias('t2')->on('t1.id=t2.run') ->where('t1.task')->in(array_keys($tasks)) @@ -388,39 +311,27 @@ class testtaskModel extends model */ public function getById($taskID, $setImgSize = false) { - if($this->config->global->flow == 'onlyTest') + $task = $this->dao->select("*")->from(TABLE_TESTTASK)->where('id')->eq((int)$taskID)->fetch(); + if($task) { - $task = $this->dao->select("t1.*, t2.name AS productName, t2.type AS productType, t3.name AS buildName, t3.branch AS branch") - ->from(TABLE_TESTTASK)->alias('t1') - ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') - ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id') - ->where('t1.id')->eq((int)$taskID) - ->fetch(); - } - else - { - $task = $this->dao->select("*")->from(TABLE_TESTTASK)->where('id')->eq((int)$taskID)->fetch(); - if($task) + $product = $this->dao->select('name,type')->from(TABLE_PRODUCT)->where('id')->eq($task->product)->fetch(); + $task->productName = $product->name; + $task->productType = $product->type; + $task->branch = 0; + $task->projectName = ''; + $task->buildName = ''; + + if($task->project) { - $product = $this->dao->select('name,type')->from(TABLE_PRODUCT)->where('id')->eq($task->product)->fetch(); - $task->productName = $product->name; - $task->productType = $product->type; - $task->branch = 0; - $task->projectName = ''; - $task->buildName = ''; + $task->projectName = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($task->project)->fetch('name'); + $task->branch = $this->dao->select('branch')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($task->project)->andWhere('product')->eq($task->product)->fetch('branch'); + } - if($task->project) - { - $task->projectName = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($task->project)->fetch('name'); - $task->branch = $this->dao->select('branch')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($task->project)->andWhere('product')->eq($task->product)->fetch('branch'); - } - - $build = $this->dao->select('branch,name')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch(); - if($build) - { - $task->buildName = $build->name; - $task->branch = $build->branch; - } + $build = $this->dao->select('branch,name')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch(); + if($build) + { + $task->buildName = $build->name; + $task->branch = $build->branch; } } diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index da34ca98c8..017f631415 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -19,7 +19,6 @@ $scope = $this->session->testTaskVersionScope; $status = $this->session->testTaskVersionStatus; ?> -global->flow != 'onlyTest'):?> @@ -50,7 +49,6 @@ $status = $this->session->testTaskVersionStatus; " . $lang->testtask->create, '', "class='btn btn-primary'");?>
    -
    @@ -69,9 +67,7 @@ $status = $this->session->testTaskVersionStatus;
    - global->flow != 'onlyTest'):?> - @@ -86,9 +82,7 @@ $status = $this->session->testTaskVersionStatus; - global->flow != 'onlyTest'):?> - diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php index ba183ad4e9..a66f41e642 100644 --- a/module/testtask/view/browseunits.html.php +++ b/module/testtask/view/browseunits.html.php @@ -41,9 +41,7 @@ - global->flow != 'onlyTest'):?> - @@ -58,9 +56,7 @@ - global->flow != 'onlyTest'):?> - diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php index ed1ffa1f56..08a7a83cb7 100644 --- a/module/testtask/view/caseheader.html.php +++ b/module/testtask/view/caseheader.html.php @@ -21,7 +21,7 @@ if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=all¶m=0"), "{$lang->testtask->allCases}", '', "id='allTab' class='btn btn-link'"); if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome¶m=0"), "{$lang->testtask->assignedToMe}", '', "id='assignedtomeTab' class='btn btn-link'"); - if($hasGroupPriv and $config->global->flow != 'onlyTest') + if($hasGroupPriv) { $groupBy = isset($groupBy) ? $groupBy : ''; $active = !empty($groupBy) ? 'btn-active-text' : ''; diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index 9dd346c606..c3c118f953 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -32,12 +32,10 @@ - global->flow != 'onlyTest'):?> -
    story->legendFromBug;?>
    story->legendLinkStories;?> diff --git a/module/task/config.php b/module/task/config.php index 5b692065c1..31e4f3ada3 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -36,7 +36,6 @@ $config->task->exportFields = ' closedBy, closedDate, closedReason, lastEditedBy, lastEditedDate,files '; -if($config->global->flow == 'onlyTask') $config->task->exportFields = str_replace(array(' story,'), '', $config->task->exportFields); $config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate'; $config->task->customBatchCreateFields = 'module,story,assignedTo,estimate,estStarted,deadline,desc,pri'; @@ -47,13 +46,6 @@ $config->task->custom->createFields = $config->task->customCreateFields; $config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri'; $config->task->custom->batchEditFields = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason'; -if($config->global->flow == 'onlyTask') -{ - $config->task->customCreateFields = str_replace(array('story,'), '', $config->task->customCreateFields); - $config->task->customBatchCreateFields = str_replace(array('story,'), '', $config->task->customBatchCreateFields); - $config->task->custom->batchCreateFields = str_replace(array('story,'), '', $config->task->custom->batchCreateFields); -} - $config->task->datatable = new stdclass(); $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions'); diff --git a/module/task/control.php b/module/task/control.php index 4215ab18c8..252022c629 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -23,13 +23,6 @@ class task extends control $this->loadModel('project'); $this->loadModel('story'); $this->loadModel('tree'); - - if($this->config->global->flow == 'onlyTask') - { - $this->config->task->customCreateFields = str_replace(array('story,'), '', $this->config->task->customCreateFields); - $this->config->task->customBatchCreateFields = str_replace(array('story,'), '', $this->config->task->customBatchCreateFields); - $this->config->task->custom->batchCreateFields = str_replace(array('story,'), '', $this->config->task->custom->batchCreateFields); - } } /** diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index d00d30eecd..9329ce954b 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -22,7 +22,7 @@ task->batchCreate;?> - type != 'ops' && $config->global->flow != 'onlyTask'):?> + type != 'ops'):?> @@ -49,7 +49,7 @@ } } $colspan = count($visibleFields) + 3; - $hiddenStory = ((isonlybody() and $storyID) || $config->global->flow == 'onlyTask') ? ' hidden' : ''; + $hiddenStory = (isonlybody() and $storyID) ? ' hidden' : ''; if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1; ?>
    diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index c9665e8bb3..8721f36acd 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -13,7 +13,7 @@ -global->flow == 'onlyTask' || !empty($task->id));?> +id));?>
    @@ -70,7 +70,7 @@
    task->story;?> @@ -85,7 +85,7 @@
    task->afterSubmit;?>task->afterChoices, $config->global->flow == 'onlyTask' || !empty($task->id) ? 'toTaskList' : 'continueAdding');?>task->afterChoices, !empty($task->id) ? 'toTaskList' : 'continueAdding');?>
    diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 641d4ac71c..70ea5527d4 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -107,7 +107,7 @@
    task->story;?> story, "class='form-control chosen'");?>
    task->story;?> diff --git a/module/testcase/control.php b/module/testcase/control.php index 59607cec44..56e78b4fe8 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -618,7 +618,6 @@ class testcase extends control $libraries = $this->loadModel('caselib')->getLibraries(); $this->caselib->setLibMenu($libraries, $case->lib); $this->lang->testcase->menu = $this->lang->caselib->menu; - if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testcase = 'caselib'; $title = "CASE #$case->id $case->title - " . $libraries[$case->lib]; $position[] = html::a($this->createLink('caselib', 'browse', "libID=$case->lib"), $libraries[$case->lib]); diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index de31393cc4..c52cd7ecd6 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -14,21 +14,4 @@ function confirmBatchDelete(actionLink) $(function() { if($('#caseList thead th.c-title').width() < 150) $('#caseList thead th.c-title').width(150); - - if(flow == 'onlyTest') - { - $('#subNavbar > .nav li[data-id=' + browseType + ']').addClass('active'); - - if(browseType == 'bysuite') - { - var $moreSuite = $('#subNavbar > .nav > li[data-id=bysuite]'); - if($moreSuite.find('.dropdown-menu').children().length) - { - $moreSuite.find('.dropdown-menu').children().each(function() - { - if($(this).data('id') == suiteID) $(this).addClass('active'); - }); - } - } - } }); diff --git a/module/testcase/model.php b/module/testcase/model.php index d77a8b7b96..c5d6238312 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -112,65 +112,8 @@ class testcaseModel extends model $this->lang->modulePageActions = $pageActions; foreach($this->lang->testcase->menu as $key => $menu) { - if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testcase', $key, $productID); - if($this->config->global->flow != 'onlyTest') - { - $replace = $productID; - } - else - { - if($key == 'bysuite') - { - $subMenu = array(); - if(common::hasPriv('testcase', 'browse')) - { - $suiteList = $this->loadModel('testsuite')->getSuites($productID); - $currentSuiteID = isset($suiteID) ? (int)$suiteID : 0; - - if($suiteList) - { - foreach($suiteList as $suiteID => $suite) - { - $suiteName = $suite->name; - if($suite->type == 'public') $suiteName .= " {$this->lang->testsuite->authorList[$suite->type]}"; - - $link = array(); - $link['module'] = 'testcase'; - $link['method'] = 'browse'; - $link['vars'] = "productID=$productID&branch=$branch&browseType=bysuite¶m=$suiteID"; - - $menu = new stdclass(); - $menu->name = $suiteID; - $menu->link = $link; - $menu->text = $suiteName; - $menu->hidden = false; - $subMenu[$suiteID] = $menu; - } - } - } - /* Avoid the menu shaking when change it by js. */ - if(isset($subMenu[$currentSuiteID])) - { - $currentSubMenu = $subMenu[$currentSuiteID]; - $this->lang->testcase->menu->bysuite['link'] = "$currentSubMenu->text|" . implode('|', $currentSubMenu->link); - } - - /* Replace for dropdown submenu. */ - if(isset($this->lang->testcase->subMenu->$key)) - { - $subMenu += common::createSubMenu($this->lang->testcase->subMenu->$key, $productID); - } - if(!empty($subMenu)) $this->lang->testcase->menu->{$key}['subMenu'] = $subMenu; - - if($this->app->getMethodName() != 'view') $this->lang->testcase->menu->bysearch = " {$this->lang->testcase->bySearch}"; - } - else - { - $replace = array(); - $replace['productID'] = $productID; - $replace['branch'] = $branch; - } - } + $this->loadModel('qa')->setSubMenu('testcase', $key, $productID); + $replace = $productID; common::setMenuVars($this->lang->testcase->menu, $key, $replace); } } diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 144dc3df11..ddd5794048 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -25,7 +25,6 @@ if(isset($menuItem->hidden)) continue; $menuType = $menuItem->name; if(!$config->testcase->needReview and empty($config->testcase->forceReview) and $menuType == 'wait') continue; - if($config->global->flow == 'onlyTest' and (strpos(',needconfirm,group,zerocase,', ',' . $menuType . ',') !== false)) continue; if($hasBrowsePriv and $menuType == 'QUERY') { $searchBrowseLink = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s"); diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 6582b2bc5d..c4441edac5 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -63,7 +63,7 @@
    testcase->lblStory;?> diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 5535136529..6b54df54f0 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -192,7 +192,7 @@
    testcase->story;?>
    story, 'class=form-control chosen');?>
    diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 1f5bb8081c..ec3105580b 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -184,7 +184,7 @@ ?>
    testcase->story;?> diff --git a/module/testreport/model.php b/module/testreport/model.php index fcf6671e0f..7cd6a47fa4 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -49,34 +49,8 @@ class testreportModel extends model $this->lang->modulePageActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { - if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testreport', $key, $productID); - if($this->config->global->flow != 'onlyTest') - { - $replace = $productID; - } - else - { - if($key == 'scope') - { - $scope = $this->session->testTaskVersionScope; - $status = $this->session->testTaskVersionStatus; - $viewName = $scope == 'local'? $products[$productID] : $this->lang->testtask->all; - - $replace = '
  • '; - $replace .= "{$viewName} "; - $replace .= "
      "; - $replace .= "
    • " . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=all,$status"), $this->lang->testtask->all) . "
      • "; - $replace .= "
    • " . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=local,$status"), $products[$productID]) . "
      • "; - $replace .= "
    • "; - } - else - { - $replace = array(); - $replace['productID'] = $productID; - $replace['branch'] = $branch; - $replace['scope'] = $this->session->testTaskVersionScope; - } - } + $this->loadModel('qa')->setSubMenu('testreport', $key, $productID); + $replace = $productID; common::setMenuVars($this->lang->testreport->menu, $key, $replace); } } diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php index a3f52a57dd..979594a029 100644 --- a/module/testreport/view/browse.html.php +++ b/module/testreport/view/browse.html.php @@ -38,9 +38,7 @@     		testreport->title);?> openedByAB);?> testreport->createdDate);?>testreport->project);?> testreport->testtask;?> actions;?>
    id&from=$objectType"), $report->title)?> createdBy);?> createdDate, 2);?>
    testreport->goal?> desc) ? $project->desc : '';?>
    testreport->profile?> diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php index 025a16593f..beb28f36c7 100644 --- a/module/testreport/view/edit.html.php +++ b/module/testreport/view/edit.html.php @@ -34,7 +34,7 @@ - global->flow != 'onlyTest' ? html::hidden('project', $project->id) : '') . html::hidden('tasks', $tasks);?> + id) . html::hidden('tasks', $tasks);?> @@ -55,13 +55,11 @@ title, "class='form-control'")?>
    testreport->goal?> desc?>
    testreport->profile?> diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php index 13a3db1a46..5b16e3a027 100644 --- a/module/testreport/view/view.html.php +++ b/module/testreport/view/view.html.php @@ -61,7 +61,7 @@ testreport->members?> members) as $member)echo zget($users, $member) . '   ';?>
    testreport->goal?> desc?> idAB);?> testtask->name);?> testtask->product);?> testtask->project);?> testtask->build);?> testtask->owner);?> testtask->begin);?>createLink('testtask', 'cases', "taskID=$task->id"), sprintf('%03d', $task->id));?> createLink('testtask', 'cases', "taskID=$task->id"), $task->name);?> productName?>projectName?> build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build", '', true), $task->buildName);?> owner);?> begin?>
    idAB);?> testtask->name);?> testtask->project);?> testtask->build);?> testtask->owner);?> testtask->execTime);?>
    id);?> id"), $task->name);?>projectName?> build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName);?> owner);?> end?>
    testtask->project;?>
    testtask->build;?> diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index b23677651e..cdbcdd81af 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -24,7 +24,6 @@ - global->flow != 'onlyTest'):?> - diff --git a/module/testtask/view/importunitresult.html.php b/module/testtask/view/importunitresult.html.php index c41ce5d884..e2acdf6c7b 100644 --- a/module/testtask/view/importunitresult.html.php +++ b/module/testtask/view/importunitresult.html.php @@ -21,12 +21,10 @@
    testtask->project;?> @@ -35,7 +34,6 @@
    testtask->build;?> build, "class='form-control chosen'");?>
    - global->flow != 'onlyTest'):?> -
    testtask->project;?>
    testtask->build;?> diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index ec522deb9e..a9fd492948 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -75,12 +75,10 @@
    - global->flow != 'onlyTest'):?> -
    testtask->project;?> projectName : html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName, '', "title='{$task->projectName}'");?>
    testtask->build;?> diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php index c97a2ac56a..2886f02569 100644 --- a/module/todo/lang/de.php +++ b/module/todo/lang/de.php @@ -92,10 +92,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . ' Aufgabe'; $lang->todo->typeList['story'] = $lang->projectCommon . ' Story'; -global $config; -if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); -if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); - $lang->todo->confirmDelete = "Möchten Sie diesen ToDo löschen?"; $lang->todo->thisIsPrivate = 'Dies ist ein privater ToDo'; $lang->todo->lblDisableDate = 'Später setzen'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index adc01e2158..8bba09917e 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -92,10 +92,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = 'Task'; $lang->todo->typeList['story'] = 'Story'; -global $config; -if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); -if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); - $lang->todo->confirmDelete = "Do you want to delete this todo?"; $lang->todo->thisIsPrivate = 'This is a private todo'; $lang->todo->lblDisableDate = 'TBD'; diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php index 0bf5d1cd61..7ddf693e88 100644 --- a/module/todo/lang/fr.php +++ b/module/todo/lang/fr.php @@ -92,10 +92,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = 'Tâche'; $lang->todo->typeList['story'] = 'Story'; -global $config; -if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); -if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); - $lang->todo->confirmDelete = "Voulez-vous supprimer cette entrée de l'agenda ?"; $lang->todo->thisIsPrivate = "Il s'agit d'un rdv privé"; $lang->todo->lblDisableDate = 'A définir'; diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php index 5d2fee1dd3..86e31d2f17 100644 --- a/module/todo/lang/vi.php +++ b/module/todo/lang/vi.php @@ -92,10 +92,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = 'Nhiệm vụ'; $lang->todo->typeList['story'] = 'Câu chuyện'; -global $config; -if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); -if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); - $lang->todo->confirmDelete = "Bạn có muốn xóa việc này?"; $lang->todo->thisIsPrivate = 'Đây là một việc riêng tư'; $lang->todo->lblDisableDate = 'TBD'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index e6eacec57e..60090d8fdc 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -92,10 +92,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . '任务'; $lang->todo->typeList['story'] = $lang->projectCommon . $lang->storyCommon; -global $config; -if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); -if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); - $lang->todo->confirmDelete = "您确定要删除这条待办吗？"; $lang->todo->thisIsPrivate = '这是一条私人事务。:)'; $lang->todo->lblDisableDate = '暂时不设定时间'; diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php index 45570a7502..9bb74b7d8e 100644 --- a/module/todo/lang/zh-tw.php +++ b/module/todo/lang/zh-tw.php @@ -92,10 +92,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . '任務'; $lang->todo->typeList['story'] = $lang->projectCommon . $lang->storyCommon; -global $config; -if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); -if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); - $lang->todo->confirmDelete = "您確定要刪除這條待辦嗎？"; $lang->todo->thisIsPrivate = '這是一條私人事務。:)'; $lang->todo->lblDisableDate = '暫時不設定時間'; diff --git a/module/todo/model.php b/module/todo/model.php index 69fe808be7..5085879c04 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -452,10 +452,6 @@ class todoModel extends model while($todo = $stmt->fetch()) { - if($this->config->global->flow == 'onlyTest' and $todo->type == 'task') continue; - if($this->config->global->flow == 'onlyTask' and $todo->type == 'bug') continue; - if($this->config->global->flow == 'onlyStory' and $todo->type != 'custom') continue; - if($todo->type == 'story') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_STORY)->fetch('title'); if($todo->type == 'task') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name'); if($todo->type == 'bug') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title'); diff --git a/module/tree/control.php b/module/tree/control.php index 3a7a16d428..89d1250239 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -83,8 +83,7 @@ class tree extends control $this->loadModel('bug')->setMenu($this->product->getPairs(), $rootID); $this->lang->tree->menu = $this->lang->bug->menu; $this->lang->tree->menuOrder = $this->lang->bug->menuOrder; - if($this->config->global->flow == 'onlyTest') $this->lang->set('menugroup.tree', 'bug'); - if($this->config->global->flow != 'onlyTest') $this->lang->set('menugroup.tree', 'qa'); + $this->lang->set('menugroup.tree', 'qa'); $title = $this->lang->tree->manageBug; $position[] = html::a($this->createLink('bug', 'browse', "product=$rootID"), $product->name); @@ -107,8 +106,7 @@ class tree extends control $this->loadModel('testcase')->setMenu($this->product->getPairs(), $rootID); $this->lang->tree->menu = $this->lang->testcase->menu; $this->lang->tree->menuOrder = $this->lang->testcase->menuOrder; - if($this->config->global->flow == 'onlyTest') $this->lang->set('menugroup.tree', 'testcase'); - if($this->config->global->flow != 'onlyTest') $this->lang->set('menugroup.tree', 'qa'); + $this->lang->set('menugroup.tree', 'qa'); $title = $this->lang->tree->manageCase; $position[] = html::a($this->createLink('testcase', 'browse', "product=$rootID"), $product->name); diff --git a/module/user/control.php b/module/user/control.php index efb7b7528d..e0302c50d8 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -37,9 +37,6 @@ class user extends control */ public function view($account) { - if($this->config->global->flow == 'onlyStory') $this->locate($this->createLink('user', 'dynamic', "period=today&account=$account")); - if($this->config->global->flow == 'onlyTask') $this->locate($this->createLink('user', 'task', "account=$account")); - if($this->config->global->flow == 'onlyTest') $this->locate($this->createLink('user', 'bug', "account=$account")); $this->locate($this->createLink('user', 'todo', "account=$account")); }