diff --git a/db/update20.0.sql b/db/update20.0.sql index af61c83627..9b641fe4fb 100644 --- a/db/update20.0.sql +++ b/db/update20.0.sql @@ -294,4 +294,4 @@ INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES (' ALTER TABLE `zt_block` ADD `type` char(30) NOT NULL AFTER `module`; ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `module`, `type`, `order`), DROP INDEX `accountModuleOrder`; -INSERT INTO `zt_cron` (`id`, `m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES (15, '1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53'); +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53'); diff --git a/db/zentao.sql b/db/zentao.sql index e55511f374..45b0a4fbbe 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1462,7 +1462,8 @@ INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type ('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('1', '0', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCompileStatus', '同步Jenkins任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=exec', '执行Jenkins任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); +('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=exec', '执行Jenkins任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), +('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53'); INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES (1, 'ADMIN', 'admin', 'for administrator'), 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 2674500eb0..c9fe7aa843 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/cmmiganttblock.html.php b/module/block/view/cmmiganttblock.html.php index 5a8ffc4e1d..e8095fd715 100644 --- a/module/block/view/cmmiganttblock.html.php +++ b/module/block/view/cmmiganttblock.html.php @@ -1,6 +1,6 @@
- 2): ?> + = 2): ?> 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 @@
- config->global->flow != 'onlyTask'): ?>
story->released;?> releasedStories;?>
@@ -196,7 +195,6 @@ $(function()
- diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php index 5330b648b9..9229d77013 100644 --- a/module/block/view/welcome.html.php +++ b/module/block/view/welcome.html.php @@ -44,7 +44,6 @@

block->leftToday?>

- config->global->flow == 'full' or $this->config->global->flow == 'onlyTask'):?>
block->myTask?>
createLink('my', 'task', 'type=assignedTo'), (int)$tasks);?>
@@ -54,8 +53,6 @@
- - config->global->flow == 'full' or $this->config->global->flow == 'onlyTest'):?>
block->myBug?>
createLink('my', 'bug', 'type=assignedTo'), (int)$bugs);?>
@@ -65,13 +62,10 @@
- - config->global->flow == 'full' or $this->config->global->flow == 'onlyStory'):?>
block->myStory?>
createLink('my', 'story', 'type=assignedTo'), (int)$stories);?>
- diff --git a/module/bug/config.php b/module/bug/config.php index b6361be210..a4fc0ecca3 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -46,17 +46,6 @@ $config->bug->custom->createFields = $config->bug->list->customCreateFields $config->bug->custom->batchCreateFields = 'project,deadline,steps,type,severity,os,browser'; $config->bug->custom->batchEditFields = 'type,severity,pri,branch,assignedTo,deadline,status,resolvedBy,resolution'; -if($config->global->flow == 'onlyTest') -{ - $config->bug->list->allFields = str_replace(array('project, ', 'story, ', 'task,'), '', $config->bug->list->allFields); - $config->bug->list->exportFields = str_replace(array('project, ', 'story, ', 'task,'), '', $config->bug->list->exportFields); - - $config->bug->list->customCreateFields = str_replace(array('project,', 'story,', 'task,'), '', $config->bug->list->customCreateFields); - $config->bug->list->customBatchCreateFields = str_replace('project,', '', $config->bug->list->customBatchCreateFields); - - $config->bug->custom->batchCreateFields = str_replace('project,', '', $config->bug->custom->batchCreateFields); -} - $config->bug->editor = new stdclass(); $config->bug->editor->create = array('id' => 'steps', 'tools' => 'bugTools'); $config->bug->editor->edit = array('id' => 'steps,comment', 'tools' => 'bugTools'); @@ -113,14 +102,6 @@ $config->bug->search['fields']['closedDate'] = $lang->bug->closedDate; $config->bug->search['fields']['lastEditedDate'] = $lang->bug->lastEditedDateAB; $config->bug->search['fields']['deadline'] = $lang->bug->deadline; -if($config->global->flow == 'onlyTest') -{ - unset($config->bug->search['fields']['project']); - unset($config->bug->search['fields']['plan']); - unset($config->bug->search['fields']['toTask']); - unset($config->bug->search['fields']['toStory']); -} - $config->bug->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->bug->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->bug->search['params']['steps'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); diff --git a/module/bug/control.php b/module/bug/control.php index b91cba7691..c0d99a60cb 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -31,14 +31,6 @@ class bug extends control $this->loadModel('task'); $this->view->products = $this->products = $this->product->getPairs('nocode'); - if($this->config->global->flow == 'onlyTest') - { - $this->config->bug->list->customCreateFields = str_replace(array('project,', 'story,', 'task,'), '', $this->config->bug->list->customCreateFields); - $this->config->bug->list->customBatchCreateFields = str_replace('project,', '', $this->config->bug->list->customBatchCreateFields); - - $this->config->bug->custom->batchCreateFields = str_replace('project,', '', $this->config->bug->custom->batchCreateFields); - } - if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=bug"))); } diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 5bd584904b..76bf55c9d3 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -1,43 +1,4 @@ $(function() { if($('#bugList thead th.c-title').width() < 150) $('#bugList thead th.c-title').width(150); - - if(flow == 'onlyTest') - { - $('#subNavbar > .nav li[data-id=' + browseType + ']').addClass('active'); - var $more = $('#subNavbar > .nav > li[data-id=more]'); - if($more.find('.dropdown-menu').children().length) - { - $more.find('.dropdown-menu').children().each(function() - { - if($(this).hasClass('active')) $more.addClass('active'); - }); - } - - var navWidth = $('#subNavbar > .nav').width(); - var leftWidth = 0; - var rightWidth = 0; - - $rightNav = $('#subNavbar > .nav > li.right'); - rightLength = $rightNav.length; - for(i = 0; i < rightLength; i++) rightWidth += $rightNav.eq(i).width(); - - var maxWidth = navWidth - $('#subNavbar > .nav > #bysearchTab').width() - rightWidth - 100; - - $('#subNavbar > .nav > li:not(.right)').each(function() - { - if(leftWidth > maxWidth) - { - if($(this).attr('id') != 'moreMenus' && $(this).attr('id') != 'bysearchTab') - { - $('#subNavbar').removeClass('hidden'); - $('#subNavbar > ul').append($(this)[0]); - } - } - else - { - leftWidth += $(this).width(); - } - }) - } }); diff --git a/module/bug/js/common.js b/module/bug/js/common.js index d648f95aa8..d10b74f9b2 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -495,7 +495,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()); link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; html += '' + createBuild + ' '; html += '' + refresh + ''; diff --git a/module/bug/model.php b/module/bug/model.php index 29f6a44109..a2d221ad74 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -91,35 +91,8 @@ class bugModel extends model $this->lang->modulePageActions = $pageActions; foreach($this->lang->bug->menu as $key => $menu) { - if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('bug', $key, $productID); - if($this->config->global->flow != 'onlyTest') - { - $replace = $productID; - } - else - { - $replace = array(); - $replace['productID'] = $productID; - $replace['branch'] = $branch; - $replace['param'] = $moduleID; - - /* Replace for dropdown submenu. */ - if(isset($this->lang->bug->subMenu->$key)) - { - $subMenu = common::createSubMenu($this->lang->bug->subMenu->$key, $replace); - - /* Avoid the menu shaking when change it by js. */ - if(isset($subMenu[$browseType])) - { - $currentSubMenu = $subMenu[$browseType]; - $this->lang->bug->menu->more['link'] = "$currentSubMenu->text|" . implode('|', $currentSubMenu->link); - } - - if(!empty($subMenu)) $this->lang->bug->menu->{$key}['subMenu'] = $subMenu; - } - - if($this->app->getMethodName() != 'view') $this->lang->bug->menu->bysearch = " {$this->lang->bug->byQuery}"; - } + $this->loadModel('qa')->setSubMenu('bug', $key, $productID); + $replace = $productID; common::setMenuVars($this->lang->bug->menu, $key, $replace); } } diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index c86fb751d9..2837b67813 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -11,13 +11,6 @@ */ ?> -global->flow == 'onlyTest'):?> - - global->flow); - global->flow != 'onlyTest');?> + bug->project : $lang->bug->type;?> @@ -111,7 +111,7 @@ js::set('flow', $config->global->flow); - config->global->flow != 'onlyTest' && $showProject):?> + @@ -228,7 +228,7 @@ js::set('flow', $config->global->flow); $showStory = strpos(",$showFields,", ',story,') !== false; $showTask = strpos(",$showFields,", ',task,') !== false; ?> - config->global->flow != 'onlyTest'):?> + bug->story : $lang->bug->task;?> diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index bb75c7bc77..899a902c57 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -112,14 +112,12 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - global->flow != 'onlyTest'):?> bug->productplan;?> plan, "class='form-control chosen'");?> - bug->type;?> bug->typeList, $bug->type, "class='form-control chosen'"); ?> @@ -172,7 +170,6 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - global->flow != 'onlyTest'):?>
bug->legendPrjStoryTask;?>
@@ -193,7 +190,6 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
-
bug->legendLife;?>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index fcb5107c15..e9adcdad75 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -77,7 +77,7 @@ common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true); common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true); - if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', '', $lang->bug->toStory); + common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', '', $lang->bug->toStory); common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap'); echo $this->buildOperateMenu($bug, 'view'); @@ -96,9 +96,7 @@
@@ -229,7 +227,6 @@
- global->flow != 'onlyTest'):?>
@@ -258,7 +255,6 @@
- @@ -356,7 +352,6 @@ - global->flow != 'onlyTest'):?> toStory != 0):?> bug->toStory;?> @@ -369,7 +364,6 @@ createLink('task', 'view', "taskID=$bug->toTask", '', true), "#$bug->toTask $bug->toTaskTitle", '', "class='iframe' data-width='80%'");?> - diff --git a/module/build/control.php b/module/build/control.php index 145530771b..a682cd3324 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -39,45 +39,27 @@ class build extends control $this->loadModel('project'); $this->loadModel('user'); - if($this->config->global->flow == 'onlyTest') - { - $product = $this->loadModel('product')->getByID($projectID); - $products = $this->product->getPairs(); - $this->product->setMenu($products, $projectID); - $this->lang->build->menu = $this->lang->product->menu; + /* Set menu. */ + $this->project->setMenu($this->project->getPairs(), $projectID); - $productGroups = array(); - $product->branch = 0; - foreach($products as $productID => $name) $productGroups[$productID]['branch'] = 0; + /* Get stories and bugs. */ + $orderBy = 'status_asc, stage_asc, id_desc'; - $this->view->title = $this->lang->build->create; - $this->view->product = $product; - $this->view->branches = ($product and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($projectID); - } - else - { - /* Set menu. */ - $this->project->setMenu($this->project->getPairs(), $projectID); + /* Assign. */ + $project = $this->loadModel('project')->getById($projectID); - /* Get stories and bugs. */ - $orderBy = 'status_asc, stage_asc, id_desc'; + $productGroups = $this->project->getProducts($projectID); + $productID = $productID ? $productID : key($productGroups); + $products = array(); + foreach($productGroups as $product) $products[$product->id] = $product->name; - /* Assign. */ - $project = $this->loadModel('project')->getById($projectID); - - $productGroups = $this->project->getProducts($projectID); - $productID = $productID ? $productID : key($productGroups); - $products = array(); - foreach($productGroups as $product) $products[$product->id] = $product->name; - - $this->view->title = $project->name . $this->lang->colon . $this->lang->build->create; - $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$projectID"), $project->name); - $this->view->position[] = $this->lang->build->create; - $this->view->product = isset($productGroups[$productID]) ? $productGroups[$productID] : ''; - $this->view->branches = (isset($productGroups[$productID]) and $productGroups[$productID]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID); - $this->view->projectID = $projectID; - $this->view->orderBy = $orderBy; - } + $this->view->title = $project->name . $this->lang->colon . $this->lang->build->create; + $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$projectID"), $project->name); + $this->view->position[] = $this->lang->build->create; + $this->view->product = isset($productGroups[$productID]) ? $productGroups[$productID] : ''; + $this->view->branches = (isset($productGroups[$productID]) and $productGroups[$productID]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID); + $this->view->projectID = $projectID; + $this->view->orderBy = $orderBy; $this->view->products = $products; $this->view->lastBuild = $this->build->getLast($projectID); @@ -116,65 +98,46 @@ class build extends control $build = $this->build->getById((int)$buildID); - if($this->config->global->flow == 'onlyTest') + $this->loadModel('project'); + + /* Set menu. */ + $this->project->setMenu($this->project->getPairs(), $build->project); + + /* Get stories and bugs. */ + $orderBy = 'status_asc, stage_asc, id_desc'; + + /* Assign. */ + $project = $this->loadModel('project')->getById($build->project); + if(empty($project)) { - $product = $this->loadModel('product')->getById($build->product); - $products = $this->product->getPairs(); - $this->product->setMenu($products, $build->product); - $this->lang->build->menu = $this->lang->product->menu; - - $productGroups = array(); - $product->branch = 0; - foreach($products as $productID => $name) $productGroups[$productID]['branch'] = 0; - - $this->view->title = $this->lang->build->edit; - $this->view->position[] = $this->lang->build->edit; - $this->view->product = $product; - $this->view->branches = ($product and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($build->product); + $project = new stdclass(); + $project->name = ''; } - else + + $projects = $this->loadModel('product')->getProjectPairs($build->product, $build->branch, 'nodeleted'); + if(!isset($projects[$build->project])) $projects[$build->project] = $project->name; + + $productGroups = $this->project->getProducts($build->project); + + $this->loadModel('product'); + if(!isset($productGroups[$build->product])) { - $this->loadModel('project'); - - /* Set menu. */ - $this->project->setMenu($this->project->getPairs(), $build->project); - - /* Get stories and bugs. */ - $orderBy = 'status_asc, stage_asc, id_desc'; - - /* Assign. */ - $project = $this->loadModel('project')->getById($build->project); - if(empty($project)) - { - $project = new stdclass(); - $project->name = ''; - } - - $projects = $this->loadModel('product')->getProjectPairs($build->product, $build->branch, 'nodeleted'); - if(!isset($projects[$build->project])) $projects[$build->project] = $project->name; - - $productGroups = $this->project->getProducts($build->project); - - $this->loadModel('product'); - if(!isset($productGroups[$build->product])) - { - $product = $this->product->getById($build->product); - $product->branch = $build->branch; - $productGroups[$build->product] = $product; - } - - $products = array(); - foreach($productGroups as $product) $products[$product->id] = $product->name; - - $this->view->title = $project->name . $this->lang->colon . $this->lang->build->edit; - $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $project->name); - $this->view->position[] = $this->lang->build->edit; - $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; - $this->view->branches = (isset($productGroups[$build->product]) and $productGroups[$build->product]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($build->product); - $this->view->projects = $projects; - $this->view->orderBy = $orderBy; + $product = $this->product->getById($build->product); + $product->branch = $build->branch; + $productGroups[$build->product] = $product; } + $products = array(); + foreach($productGroups as $product) $products[$product->id] = $product->name; + + $this->view->title = $project->name . $this->lang->colon . $this->lang->build->edit; + $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $project->name); + $this->view->position[] = $this->lang->build->edit; + $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; + $this->view->branches = (isset($productGroups[$build->product]) and $productGroups[$build->product]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($build->product); + $this->view->projects = $projects; + $this->view->orderBy = $orderBy; + $this->view->productGroups = $productGroups; $this->view->products = $products; $this->view->users = $this->loadModel('user')->getPairs('noletter', $build->builder); @@ -221,39 +184,26 @@ class build extends control ->page($bugPager) ->fetchAll(); - if($this->config->global->flow == 'onlyTest') - { - $products = $this->loadModel('product')->getPairs(); - $this->product->setMenu($products, $build->product, $buildID); - $this->lang->build->menu = $this->lang->product->menu; + $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1); + $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($build->stories)->andWhere('deleted')->eq(0) + ->beginIF($type == 'story')->orderBy($orderBy)->fi() + ->page($storyPager) + ->fetchAll('id'); + $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($build->stories)->andWhere('branch')->eq($build->branch)->fetchPairs('story', 'stage'); + foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage; - $this->view->title = "BUILD #$build->id $build->name - " . $build->productName; - $this->view->position[] = html::a($this->createLink('product', 'build', "productID=$build->product"), $build->productName); - $this->view->position[] = $this->lang->build->view; - } - else - { - $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1); - $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($build->stories)->andWhere('deleted')->eq(0) - ->beginIF($type == 'story')->orderBy($orderBy)->fi() - ->page($storyPager) - ->fetchAll('id'); - $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($build->stories)->andWhere('branch')->eq($build->branch)->fetchPairs('story', 'stage'); - foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage; + $this->loadModel('project')->setMenu($this->project->getPairs(), $build->project, $buildID); + $projects = $this->project->getPairs('empty'); - $this->loadModel('project')->setMenu($this->project->getPairs(), $build->project, $buildID); - $projects = $this->project->getPairs('empty'); + $this->view->title = "BUILD #$build->id $build->name - " . $projects[$build->project]; + $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $projects[$build->project]); + $this->view->position[] = $this->lang->build->view; + $this->view->stories = $stories; + $this->view->storyPager = $storyPager; - $this->view->title = "BUILD #$build->id $build->name - " . $projects[$build->project]; - $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $projects[$build->project]); - $this->view->position[] = $this->lang->build->view; - $this->view->stories = $stories; - $this->view->storyPager = $storyPager; - - $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1); - $this->view->generatedBugs = $this->bug->getProjectBugs($build->project, $build->id, '', 0, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager); - $this->view->generatedBugPager = $generatedBugPager; - } + $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1); + $this->view->generatedBugs = $this->bug->getProjectBugs($build->project, $build->id, '', 0, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager); + $this->view->generatedBugPager = $generatedBugPager; $this->executeHooks($buildID); @@ -309,7 +259,6 @@ class build extends control $this->send($response); } - if($this->config->global->flow == 'onlyTest') die(js::locate($this->createLink('project', 'build', "productID=$build->product"), 'parent')); die(js::locate($this->createLink('project', 'build', "projectID=$build->project"), 'parent')); } } diff --git a/module/build/js/view.js b/module/build/js/view.js index ef33582dd2..9112ee4883 100644 --- a/module/build/js/view.js +++ b/module/build/js/view.js @@ -44,30 +44,27 @@ function loadURL(url, type) $(function() { - if(flow != 'onlyTest') + if(link == 'true') showLink(buildID, type, param); + var infoShowed = false; + $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) { - if(link == 'true') showLink(buildID, type, param); - var infoShowed = false; - $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) + var href = $(e.target).attr('href'); + var tabPane = $(href + '.tab-pane'); + if(tabPane.size() == 0) return; + var formID = tabPane.find('.linkBox').find('form:last'); + if(formID.size() == 0) formID = tabPane.find('form:last'); + + if(href == '#buildInfo' && !infoShowed) { - var href = $(e.target).attr('href'); - var tabPane = $(href + '.tab-pane'); - if(tabPane.size() == 0) return; - var formID = tabPane.find('.linkBox').find('form:last'); - if(formID.size() == 0) formID = tabPane.find('form:last'); - - if(href == '#buildInfo' && !infoShowed) + var $tr = $('#buildInfo .detail-content .table-data tbody tr:first'); + width = $tr.width() - $tr.find('th').width(); + $('#buildInfo img').each(function() { - var $tr = $('#buildInfo .detail-content .table-data tbody tr:first'); - width = $tr.width() - $tr.find('th').width(); - $('#buildInfo img').each(function() - { - if($(this).parent().prop('tagName').toLowerCase() == 'a') $(this).unwrap(); - setImageSize($(this), width, 0); - }); + if($(this).parent().prop('tagName').toLowerCase() == 'a') $(this).unwrap(); + setImageSize($(this), width, 0); + }); - infoShowed = true; - } - }); - } + infoShowed = true; + } + }); }) diff --git a/module/build/model.php b/module/build/model.php index bdd36a63f0..b1e67893be 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -208,8 +208,6 @@ class buildModel extends model ->remove('resolvedBy,allchecker,files,labels,uid') ->get(); - if($this->config->global->flow == 'onlyTest') $build->project = 0; - $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_BUILD)->data($build) ->autoCheck() @@ -244,7 +242,6 @@ class buildModel extends model ->remove('allchecker,resolvedBy,files,labels,uid') ->get(); - if($this->config->global->flow == 'onlyTest') $this->config->build->edit->requiredFields = str_replace('project,', '', $this->config->build->edit->requiredFields); $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->edit['id'], $this->post->uid); $this->dao->update(TABLE_BUILD)->data($build) ->autoCheck() diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 78386ca79a..c96c4dd320 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -43,12 +43,10 @@ build->notice->changeProduct;?> - config->global->flow != 'onlyTest'):?> build->project;?> project, "class='form-control chosen' required");?> - build->name;?> name, "class='form-control' required");?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index da89fa4ad9..ab98595e97 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -59,28 +59,6 @@ tbody tr td:first-child input{display:none;}
- global->flow == 'onlyTest'):?> -
-
build->desc;?>
-
desc;?>
-
- fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?> - -
- -
- deleted) - { - echo "
"; - common::printIcon('build', 'edit', "buildID=$build->id", $build); - common::printIcon('build', 'delete', "buildID=$build->id", $build, 'button', '', 'hiddenwin'); - } - ?> -
-
-
- global->flow != 'onlyTest'):?> fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?> - - -global->flow != 'onlyTest'):?> id)?> - diff --git a/module/caselib/model.php b/module/caselib/model.php index e426b514d9..b73209dab3 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -41,24 +41,6 @@ class caselibModel extends model } } - if($this->config->global->flow == 'onlyTest') - { - $modules = $this->loadModel('tree')->getModulePairs($libID, 'caselib'); - $moduleName = ($moduleID && isset($modules[$moduleID])) ? $modules[$moduleID] : $this->lang->tree->all; - - if(!$isMobile) - { - $dropMenuLink = helper::createLink('tree', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse"); - $selectHtml .= "
"; - } - else - { - $selectHtml .= "{$moduleName} "; - } - } - setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot, '', false, true); $pageNav = ''; diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 085d032cd5..64c11db67c 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -19,7 +19,6 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); js::set('batchDelete', $lang->testcase->confirmBatchDelete); js::set('flow', $config->global->flow); ?> -global->flow != 'onlyTest'):?>