diff --git a/module/block/control.php b/module/block/control.php index b31f136d20..b63a02e337 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1118,7 +1118,7 @@ class block extends control $productID = isset($this->session->product) ? 0 : $this->session->product; if($productID && !array_key_exists($productID, $products)) $productID = 0; - $this->view->plans = $this->loadModel('programplan')->getDataForGantt($this->session->program, $productID); + $this->view->plans = $this->loadModel('programplan')->getDataForGantt($this->session->program, $productID, 0, 'task'); $this->view->products = $products; $this->view->productID = $productID; } diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index f1f8c11f22..d18e2fabbb 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -262,7 +262,7 @@ function reloadRoadmap(productID) { $("#roadMap").html(''); $("#roadMap").html(data); - $("#createPlanLink").attr('href',createLink('productplan', 'create', 'id=' + productID) ); + $('#productID').chosen(); } }) } diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 605fcfae1e..ec7fb178b2 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -483,7 +483,6 @@ $lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation| $lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; $lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; $lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumroadmap = 'product|all|'; $lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; $lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; $lang->block->modules['program']->moreLinkList->scrumproject = 'project|all|'; diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php index 13dc70d7e0..28680d4c86 100644 --- a/module/block/view/scrumroadmapblock.html.php +++ b/module/block/view/scrumroadmapblock.html.php @@ -10,21 +10,27 @@ * @link http://www.zentao.net */ ?> - +' : '';?>
-
-
createLink('productplan', 'create', 'productID=' . $productID), ''. $lang->productplan->create, '', 'class="btn btn-mini" id="createPlanLink"');?>
+
+
createLink('productplan', 'create', 'productID=' . $productID), ''. $lang->productplan->create, '', 'class="btn btn-mini" id="createPlanLink"');?>
+
-
+
block->emptyTip;?>
@@ -37,41 +43,11 @@
  • begin) echo 'class="active"';?>> id}");?>"> title;?> - begin;?> - block->estimatedHours;?> hour;?> h - -
    • - -
  • - id}");?>"> - buildName)";?>">name . "($plan->buildName)";?> - date;?> - stories) ? 0 : $this->block->getStorysEstimateHours(explode(',', $plan->stories));?> - block->consumedHours;?> h - -
    • - - - - - -
    - -
    - - -
    block->emptyTip;?>
    - -
    -
    - + +' : '';?> diff --git a/module/design/control.php b/module/design/control.php index f2b748f22f..fd7c47a959 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -49,6 +49,7 @@ class design extends control $this->view->designs = $designs; $this->view->type = $type; + $this->view->param = $param; $this->view->recTotal = $recTotal; $this->view->recPerPage = $recPerPage; $this->view->pageID = $pageID; diff --git a/module/design/css/commit.css b/module/design/css/commit.css index 71e8d1ff9e..d1a2a856a5 100644 --- a/module/design/css/commit.css +++ b/module/design/css/commit.css @@ -1,3 +1,4 @@ +#mainContent {min-height: 350px;} .searchBox{min-height: 45px;} .searchBox .srearch-date{float: left; width: 20%} .searchBox h4{float:left;display: inline-block} diff --git a/module/design/view/batchcreate.html.php b/module/design/view/batchcreate.html.php index b67cd556ae..5714675f90 100644 --- a/module/design/view/batchcreate.html.php +++ b/module/design/view/batchcreate.html.php @@ -21,8 +21,8 @@ design->id;?> design->story;?> - design->type;?> - design->name;?> + design->type;?> + design->name;?> diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php index e50b8687a0..6d74a11eba 100644 --- a/module/design/view/browse.html.php +++ b/module/design/view/browse.html.php @@ -39,7 +39,7 @@
    - recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID";?> + recTotal}&recPerPage={$pager->recPerPage}";?> diff --git a/module/issue/view/create.html.php b/module/issue/view/create.html.php index d770e503ac..89ad73425f 100644 --- a/module/issue/view/create.html.php +++ b/module/issue/view/create.html.php @@ -64,7 +64,7 @@ - + diff --git a/module/programplan/control.php b/module/programplan/control.php index 011e276f7f..477c082c4c 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -152,7 +152,7 @@ class programplan extends control $custom = empty($data->stageCustom) ? '' : implode(',', $data->stageCustom); $setting->setItem("$owner.$module.$section.$object", $custom); - $respone = array(); + $response = array(); $response['result'] = 'success'; $response['message'] = ''; $this->send($response); diff --git a/module/programplan/model.php b/module/programplan/model.php index 4eb96fe7b4..1a66e9cd71 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -99,7 +99,17 @@ class programplanModel extends model return $pairs; } - public function getDataForGantt($programID, $productID, $baselineID = 0) + /** + * Get gantt data + * + * @param int $programID + * @param int $productID + * @param int $baselineID + * @param string $selectCustom + * @access public + * @return string + */ + public function getDataForGantt($programID, $productID, $baselineID = 0, $selectCustom = '') { $this->loadModel('stage'); @@ -161,7 +171,8 @@ class programplanModel extends model $section = 'browse'; $object = 'stageCustom'; $setting = $this->loadModel('setting'); - $selectCustom = $setting->getItem("owner={$owner}&module={$module}§ion={$section}&key={$object}"); + + if(empty($selectCustom)) $selectCustom = $setting->getItem("owner={$owner}&module={$module}§ion={$section}&key={$object}"); $tasks = array(); if(strpos($selectCustom, 'task') !== false) diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index cd22c791c4..ddcea655c9 100644 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -27,13 +27,13 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
    idAB);?>
    issue->activity;?>