diff --git a/module/block/control.php b/module/block/control.php index 99f761ec01..29e22af8e0 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -49,9 +49,17 @@ class block extends control if(!common::hasPriv($moduleKey, 'index')) unset($modules[$moduleKey]); } + if($this->config->global->flow != 'full') + { + unset($modules['todo']); + unset($modules['qa']); + } + if($this->config->global->flow == 'onlyStory') unset($modules['project']); + if($this->config->global->flow == 'onlyTask') unset($modules['product']); + $closedBlock = isset($this->config->block->closed) ? $this->config->block->closed : ''; if(strpos(",$closedBlock,", ",|dynamic,") === false) $modules['dynamic'] = $this->lang->block->dynamic; - if(strpos(",$closedBlock,", ",|flowchart,") === false) $modules['flowchart'] = $this->lang->block->lblFlowchart; + if(strpos(",$closedBlock,", ",|flowchart,") === false and $this->config->global->flow == 'full') $modules['flowchart'] = $this->lang->block->lblFlowchart; if(strpos(",$closedBlock,", ",|html,") === false) $modules['html'] = 'HTML'; $modules = array('' => '') + $modules; @@ -203,8 +211,11 @@ class block extends control if($this->block->initBlock($module)) die(js::reload()); } - foreach($blocks as $block) + foreach($blocks as $key => $block) { + if($this->config->global->flow == 'onlyStory' and strpos(',product,story,', ',' . $block->source . ',') === false and $block->block != 'dynamic') unset($blocks[$key]); + if($this->config->global->flow == 'onlyTask' and strpos(',project,task,', ',' . $block->source . ',') === false 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/common/model.php b/module/common/model.php index 53e95b8c8a..4eec958ef7 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -125,6 +125,20 @@ class commonModel extends model $this->config->system = isset($config['system']) ? $config['system'] : array(); $this->config->personal = isset($config[$account]) ? $config[$account] : array(); + foreach($this->config->system as $module => $records) + { + /* Overide the items defined in config/config.php and config/my.php. */ + if(!isset($this->config->$module)) $this->config->$module = new stdclass(); + if(isset($this->config->system->$module)) helper::mergeConfig($this->config->system->$module, $module); + } + + foreach($this->config->personal as $module => $records) + { + /* Overide the items defined in config/config.php and config/my.php. */ + if(!isset($this->config->$module)) $this->config->$module = new stdclass(); + if(isset($this->config->personal->$module)) helper::mergeConfig($this->config->personal->$module, $module); + } + /* Overide the items defined in config/config.php and config/my.php. */ if(isset($this->config->system->common)) helper::mergeConfig($this->config->system->common, 'common'); if(isset($this->config->personal->common)) helper::mergeConfig($this->config->personal->common, 'common'); @@ -374,11 +388,33 @@ class commonModel extends model */ public static function printSearchBox() { - global $app, $lang; + global $app, $config, $lang; $moduleName = $app->getModuleName(); $methodName = $app->getMethodName(); $searchObject = $moduleName; + if($config->global->flow == 'onlyStory') + { + /* Adjust search items. */ + unset($lang->searchObjects['bug']); + unset($lang->searchObjects['task']); + unset($lang->searchObjects['testcase']); + unset($lang->searchObjects['project']); + unset($lang->searchObjects['build']); + unset($lang->searchObjects['testtask']); + } + elseif($config->global->flow == 'onlyTask') + { + unset($lang->searchObjects['bug']); + unset($lang->searchObjects['story']); + unset($lang->searchObjects['product']); + unset($lang->searchObjects['testcase']); + unset($lang->searchObjects['build']); + unset($lang->searchObjects['release']); + unset($lang->searchObjects['productplan']); + unset($lang->searchObjects['testtask']); + } + if($moduleName == 'product') { if($methodName == 'browse') $searchObject = 'story'; @@ -391,7 +427,12 @@ class commonModel extends model { $searchObject = $methodName; } - if(empty($lang->searchObjects[$searchObject])) $searchObject = 'bug'; + if(empty($lang->searchObjects[$searchObject])) + { + $searchObject = 'bug'; + if($config->global->flow == 'onlyStory') $searchObject = 'story'; + if($config->global->flow == 'onlyTask') $searchObject = 'task'; + } echo ""; common::setMenuVars($this->lang->doc->menu, 'list', $selectHtml); @@ -705,11 +705,18 @@ 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(); - $hasProject = $this->dao->select('DISTINCT 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'); + if($this->config->global->flow == 'onlyStory') + { + $hasProject = array(); + } + else + { + $hasProject = $this->dao->select('DISTINCT 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'); @@ -804,11 +811,18 @@ 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') { - $hasProject = $this->dao->select('DISTINCT product')->from(TABLE_PROJECTPRODUCT)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') - ->where('t1.product')->in($idList) - ->andWhere('t2.deleted')->eq(0) - ->fetchPairs('product', 'product'); + if($this->config->global->flow == 'onlyStory') + { + $hasProject = array(); + } + else + { + $hasProject = $this->dao->select('DISTINCT product')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->in($idList) + ->andWhere('t2.deleted')->eq(0) + ->fetchPairs('product', 'product'); + } } $buildGroups = array(); foreach($libGroups as $objectID => $libs) @@ -839,11 +853,18 @@ 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') { - $hasProject = $this->dao->select('DISTINCT product')->from(TABLE_PROJECTPRODUCT)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') - ->where('t1.product')->eq($objectID) - ->andWhere('t2.deleted')->eq(0) - ->fetchPairs('product', 'product'); + if($this->config->global->flow == 'onlyStory') + { + $hasProject = array(); + } + else + { + $hasProject = $this->dao->select('DISTINCT product')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->eq($objectID) + ->andWhere('t2.deleted')->eq(0) + ->fetchPairs('product', 'product'); + } } $libs = array(); foreach($objectLibs as $lib) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 52525a82c0..6fc2e0f3dc 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1298,3 +1298,103 @@ $lang->changelog['9.1'][] = 'caselib-libView'; $lang->changelog['9.1'][] = 'testtask-activate'; $lang->changelog['9.1'][] = 'testtask-block'; $lang->changelog['9.1'][] = 'testtask-report'; + +global $config; +if($config->global->flow != 'full') +{ + unset($lang->resource->todo); + unset($lang->moduleOrder[10]); + unset($lang->resource->qa); + unset($lang->moduleOrder[50]); + unset($lang->resource->report); + unset($lang->moduleOrder[90]); + + unset($lang->resource->my->todo); +} + +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/product/js/common.js b/module/product/js/common.js index 49b8e6e3a4..8062324425 100644 --- a/module/product/js/common.js +++ b/module/product/js/common.js @@ -2,3 +2,8 @@ function setWhite(acl) { acl == 'custom' ? $('#whitelistBox').removeClass('hidden') : $('#whitelistBox').addClass('hidden'); } + +$(document).ready(function() +{ + if(onlyStory) $('#aclprivate').parents('.radio').remove(); +}) diff --git a/module/product/view/browsedata.html.php b/module/product/view/browsedata.html.php index 768e39929f..58a86d1727 100644 --- a/module/product/view/browsedata.html.php +++ b/module/product/view/browsedata.html.php @@ -91,7 +91,10 @@ common::printIcon('story', 'review', $vars, $story, 'list', 'review'); common::printIcon('story', 'close', $vars, $story, 'list', 'off', '', 'iframe', true); common::printIcon('story', 'edit', $vars, $story, 'list', 'pencil'); - common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); + 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'); + } ?> diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index 9b4656406d..56abc78615 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -12,6 +12,7 @@ ?> +global->flow == 'onlyStory' ? true : false);?>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 556ec4a18f..600ff96dc6 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -12,6 +12,7 @@ ?> +global->flow == 'onlyStory' ? true : false);?>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 4fc831c1df..08357d84be 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -71,7 +71,7 @@ id&type=story&orderBy=id_desc&link=true"), '', '', "class='btn-icon' title='{$lang->productplan->linkStory}'"); - if(common::hasPriv('productplan', 'linkBug')) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '', '', "class='btn-icon' title='{$lang->productplan->linkBug}'"); + 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-icon' title='{$lang->productplan->linkBug}'"); common::printIcon('productplan', 'edit', "planID=$plan->id", '', 'list'); if(common::hasPriv('productplan', 'delete')) diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index e388961b8d..32de7f7eb9 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -32,7 +32,7 @@ echo "
"; common::printIcon('story', 'create', "productID=$plan->product&branch=$plan->branch&moduleID=0&storyID=0&projectID=0&bugID=0&planID=$plan->id", '', 'button', 'plus'); if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), ' ' . $lang->productplan->linkStory, '', "class='btn'"); - if(common::hasPriv('productplan', 'linkBug')) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), ' ' . $lang->productplan->linkBug, '', "class='btn'"); + 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"), ' ' . $lang->productplan->linkBug, '', "class='btn'"); echo '
'; echo "
"; common::printIcon('productplan', 'edit', "planID=$plan->id"); @@ -52,7 +52,9 @@
diff --git a/module/project/control.php b/module/project/control.php index ea77051622..5f968ac98e 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -128,13 +128,15 @@ 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->loadModel('product')->getProductsByProject($projectID); + $products = $this->config->global->flow == 'onlyTask' ? array() : $this->loadModel('product')->getProductsByProject($projectID); setcookie('preProjectID', $projectID, $this->config->cookieLife, $this->config->webRoot); + if($this->cookie->preProjectID != $projectID) { $_COOKIE['moduleBrowseParam'] = $_COOKIE['productBrowseParam'] = 0; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 68502ff6f6..483c46f91f 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -261,3 +261,10 @@ $lang->project->treeLevel['root'] = '全部折叠'; $lang->project->treeLevel['story'] = '显示需求'; $lang->project->treeLevel['task'] = '显示任务'; $lang->project->treeLevel['all'] = '全部展开'; + +global $config; +if($config->global->flow == 'onlyTask') +{ + unset($lang->project->groups['story']); + unset($lang->project->featureBar['task']['needconfirm']); +} diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 44de1ebc28..cd595ec81b 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -88,7 +88,8 @@
project->typeDesc;?>
- + config->global->flow != '')?> + config->global->flow != 'onlyTask') echo "class='hidden'";?>> project->manageProducts;?>
diff --git a/module/project/view/tips.html.php b/module/project/view/tips.html.php index c1e1830c51..b932b2b231 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'");?> - createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory, '', "class='btn'");?> + config->global->flow != 'onlyTask') 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/release/view/browse.html.php b/module/release/view/browse.html.php index 531ad8576b..1e346bfd4f 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -52,7 +52,7 @@ id&type=story&link=true"), ' ', '', "class='btn-icon' title='{$lang->release->linkStory}'"); - if(common::hasPriv('release', 'linkBug')) echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn-icon' title='{$lang->release->linkBug}'"); + if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn-icon' title='{$lang->release->linkBug}'"); if(common::hasPriv('release', 'changeStatus')) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 1f645e4b58..d55c6f2123 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -35,7 +35,7 @@ echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), ' ' . $lang->release->changeStatusList[$changedStatus], 'hiddenwin', "class='btn'"); } if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), ' ' . $lang->release->linkStory, '', "class='btn'"); - if(common::hasPriv('release', 'linkBug')) echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ' . $lang->release->linkBug, '', "class='btn'"); + if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ' . $lang->release->linkBug, '', "class='btn'"); echo '
'; echo "
"; @@ -65,9 +65,11 @@ diff --git a/module/story/model.php b/module/story/model.php index a9d1a13304..df4b509bf4 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2326,7 +2326,7 @@ class storyModel extends model common::printIcon('story', 'review', $vars, $story, 'list', 'review'); common::printIcon('story', 'close', $vars, $story, 'list', 'off', '', 'iframe', true); common::printIcon('story', 'edit', $vars, $story, 'list', 'pencil'); - common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); + 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'); break; } echo ''; diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 658084de92..6b3de95bd0 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -54,7 +54,7 @@ common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe text-danger', true); common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe text-success', true); - if(!isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) + if($this->config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) { $this->app->loadLang('testcase'); echo "
"; @@ -272,10 +272,15 @@
+ global->flow != 'onlyStory'):?>
-
+ +
+ global->flow != 'onlyStory'):?> @@ -337,8 +344,9 @@ + - + - + config->global->flow != 'onlyTask'):?> - + config->global->flow == 'onlyTask' ? "class='hidden'" : '';?>> - + diff --git a/module/user/control.php b/module/user/control.php index da25826d2f..9949bbcc02 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -36,6 +36,9 @@ 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")); } diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php index 698a247696..62cfa9b2c4 100755 --- a/module/user/view/featurebar.html.php +++ b/module/user/view/featurebar.html.php @@ -7,13 +7,32 @@ $date = isset($date) ? $date : helper::today(); echo "
  • " . $userList . '
    • '; - echo "
  • "; common::printLink('user', 'todo', "account=$account", $lang->user->todo); echo '
    • '; - echo "
  • "; common::printLink('user', 'story', "account=$account", $lang->user->story); echo '
    • '; - echo "
  • "; common::printLink('user', 'task', "account=$account", $lang->user->task); echo '
    • '; - echo "
  • " ; common::printLink('user', 'bug', "account=$account", $lang->user->bug); echo '
    • '; - echo "
  • "; common::printLink('user', 'testtask', "account=$account", $lang->user->test); echo '
    • '; + if($config->global->flow == 'full') + { + echo "
  • "; common::printLink('user', 'todo', "account=$account", $lang->user->todo); echo '
    • '; + } + + if($config->global->flow != 'onlyTask') + { + echo "
  • "; common::printLink('user', 'story', "account=$account", $lang->user->story); echo '
    • '; + } + + if($config->global->flow == 'full' or $config->global->flow == 'onlyTask') + { + echo "
  • "; common::printLink('user', 'task', "account=$account", $lang->user->task); echo '
    • '; + } + + if($config->global->flow == 'full' or $config->global->flow == 'onlyTest') + { + echo "
  • " ; common::printLink('user', 'bug', "account=$account", $lang->user->bug); echo '
    • '; + echo "
  • "; common::printLink('user', 'testtask', "account=$account", $lang->user->test); echo '
    • '; + } echo "
  • "; common::printLink('user', 'dynamic', "type=today&account=$account", $lang->user->dynamic); echo '
    • ' ; - echo "
  • "; common::printLink('user', 'project', "account=$account", $lang->user->project); echo '
    • '; + + if($config->global->flow == 'full' or $config->global->flow == 'onlyTask') + { + echo "
  • "; common::printLink('user', 'project', "account=$account", $lang->user->project); echo '
    • '; + } echo "
  • "; common::printLink('user', 'profile', "account=$account", $lang->user->profile); echo '
    • '; $activedSpan = $this->app->getMethodName() . 'Tab';
    story->legendFromBug;?>
    story->legendLinkStories;?>story->legendLinkStories;?>
      config->global->flow == 'onlyTask') ? ' 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 b4c2205dc5..405ca81702 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -42,7 +42,7 @@
    task->story;?> @@ -65,7 +65,9 @@
    name, "class='form-control' autocomplete='off'");?> + config->global->flow != 'onlyTask'):?> task->copyStoryTitle;?> +
    files;?>     		fetch('file', 'buildform');?>
    task->afterSubmit;?>task->afterChoices, 'continueAdding');?>task->afterChoices, $this->config->global->flow == 'onlyTask' ? 'toTaskList' : 'continueAdding');?>