';
foreach($years as $year)
{
- echo '| ';
- foreach($roadmaps[$year] as $key => $roadmap)
+ foreach($roadmaps[$year] as $branch => $roadmapData)
{
- if(isset($roadmap->build))
+ echo ' | ';
+ if(!empty($branches)) echo " {$branches[$branch]} ";
+ foreach($roadmapData as $key => $roadmap)
{
- echo "";
- echo " " . html::a($this->createLink('release', 'view', "releaseID=$roadmap->id"), $roadmap->name, '_blank') . '' . $roadmap->date;
+ if(isset($roadmap->build))
+ {
+ echo " ";
+ echo " " . html::a($this->createLink('release', 'view', "releaseID=$roadmap->id"), $roadmap->name, '_blank') . '' . $roadmap->date;
+ }
+ else
+ {
+ echo " ";
+ echo " " . html::a($this->createLink('productplan', 'view', "planID=$roadmap->id"), $roadmap->title, '_blank') . '' . $roadmap->begin . ' ~ ' . $roadmap->end;
+ }
+ echo "";
+ if(isset($roadmaps[$year][$branch][$key + 1])) echo " {$lang->downArrow}";
}
- else
- {
- echo " ";
- echo " " . html::a($this->createLink('productplan', 'view', "planID=$roadmap->id"), $roadmap->title, '_blank') . '' . $roadmap->begin . ' ~ ' . $roadmap->end;
- }
- echo "";
- if(isset($roadmaps[$year][$key + 1])) echo " {$lang->downArrow}";
+ echo ' | ';
}
- echo '';
}
echo '
';
?>
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 0d80894d09..7de6634094 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -204,7 +204,15 @@ class productplanModel extends model
$this->loadModel('action');
foreach($this->post->stories as $storyID)
{
- $this->dao->update(TABLE_STORY)->set("plan=CONCAT(plan, ',', $planID)")->where('id')->eq((int)$storyID)->exec();
+ if($this->session->currentProductType == 'normal')
+ {
+ $this->dao->update(TABLE_STORY)->set("plan")->eq($planID)->where('id')->eq((int)$storyID)->exec();
+ }
+ else
+ {
+ $this->dao->update(TABLE_STORY)->set("plan")->eq($planID)->where('id')->eq((int)$storyID)->andWhere('branch')->ne('0')->exec();
+ $this->dao->update(TABLE_STORY)->set("plan=CONCAT(plan, ',', $planID)")->where('id')->eq((int)$storyID)->andWhere('branch')->eq('0')->exec();
+ }
$this->action->create('story', $storyID, 'linked2plan', '', $planID);
$this->story->setStage($storyID);
}
diff --git a/module/release/control.php b/module/release/control.php
index 99efb0302d..2a9d847f7f 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -26,7 +26,7 @@ class release extends control
$this->view->branch = $branch;
$this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id);
$this->view->position[] = html::a($this->createLink('product', 'browse', "productID={$this->view->product->id}&branch=$branch"), $this->view->product->name);
- $this->product->setMenu($this->product->getPairs(), $productID);
+ $this->product->setMenu($this->product->getPairs(), $productID, $branch);
}
/**
@@ -36,14 +36,14 @@ class release extends control
* @access public
* @return void
*/
- public function browse($productID)
+ public function browse($productID, $branch = 0)
{
- $this->commonAction($productID);
+ $this->commonAction($productID, $branch);
$products = $this->product->getPairs();
$this->session->set('releaseList', $this->app->getURI(true));
$this->view->title = $products[$productID] . $this->lang->colon . $this->lang->release->browse;
$this->view->position[] = $this->lang->release->browse;
- $this->view->releases = $this->release->getList($productID);
+ $this->view->releases = $this->release->getList($productID, $branch);
$this->display();
}
@@ -54,7 +54,7 @@ class release extends control
* @access public
* @return void
*/
- public function create($productID)
+ public function create($productID, $branch = 0)
{
if(!empty($_POST))
{
@@ -64,17 +64,17 @@ class release extends control
die(js::locate(inlink('view', "releaseID=$releaseID"), 'parent'));
}
- $builds = $this->loadModel('build')->getProductBuildPairs($productID);
- $releaseBuilds = $this->release->getReleaseBuilds($productID);
+ $builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch);
+ $releaseBuilds = $this->release->getReleaseBuilds($productID, $branch);
foreach($releaseBuilds as $build) unset($builds[$build]);
unset($builds['trunk']);
- $this->commonAction($productID);
+ $this->commonAction($productID, $branch);
$this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->edit;
$this->view->position[] = $this->lang->release->create;
$this->view->builds = $builds;
$this->view->productID = $productID;
- $this->view->lastRelease = $this->release->getLast($productID);
+ $this->view->lastRelease = $this->release->getLast($productID, $branch);
$this->display();
}
diff --git a/module/release/model.php b/module/release/model.php
index c59f882243..a32e35d39b 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -46,13 +46,14 @@ class releaseModel extends model
* @access public
* @return array
*/
- public function getList($productID)
+ public function getList($productID, $branch = 0)
{
return $this->dao->select('t1.*, t2.name as productName, t3.name as buildName')
->from(TABLE_RELEASE)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')
->where('t1.product')->eq((int)$productID)
+ ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
->andWhere('t1.deleted')->eq(0)
->orderBy('t1.date DESC')
->fetchAll();
@@ -65,10 +66,11 @@ class releaseModel extends model
* @access public
* @return bool | object
*/
- public function getLast($productID)
+ public function getLast($productID, $branch = 0)
{
return $this->dao->select('id, name')->from(TABLE_RELEASE)
->where('product')->eq((int)$productID)
+ ->beginIF($branch)->andWhere('branch')->eq($branch)->fi()
->orderBy('date DESC')
->limit(1)
->fetch();
@@ -81,9 +83,13 @@ class releaseModel extends model
* @access public
* @return void
*/
- public function getReleaseBuilds($productID)
+ public function getReleaseBuilds($productID, $branch = 0)
{
- $releases = $this->dao->select('build')->from(TABLE_RELEASE)->where('deleted')->eq(0)->andWhere('product')->eq($productID)->fetchAll('build');
+ $releases = $this->dao->select('build')->from(TABLE_RELEASE)
+ ->where('deleted')->eq(0)
+ ->andWhere('product')->eq($productID)
+ ->beginIF($branch)->andWhere('branch')->eq($branch)->fi()
+ ->fetchAll('build');
return array_keys($releases);
}
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 6b4338c74e..e543c0f91d 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -17,7 +17,7 @@