Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix Bug #1538 #1539.

Browse Source
This commit is contained in:
estellbright
2018-04-27 11:00:24 +08:00
parent eb75fcc2ea
commit 538b7c65a3
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/control.php
+1 -3
View File
@@ -264,9 +264,7 @@ class productplan extends control
}
$this->loadModel('datatable');
$showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
$this->view->modulePairs = $showModule ? $this->loadModel('tree')->getModulePairs($plan->product, 'story', $showModule) : array();
$this->view->modulePairs = $this->loadModel('tree')->getOptionMenu($plan->product, 'story');
$this->view->title = "PLAN #$plan->id $plan->title/" . $products[$plan->product];
$this->view->position[] = $this->lang->productplan->view;
$this->view->planStories = $planStories;
module/productplan/model.php
+20
View File
@@ -280,11 +280,20 @@ class productplanModel extends model
$stories = $this->story->getByList($this->post->stories);
$plan = $this->getByID($planID);
$currentOrder = $plan->order;
foreach($this->post->stories as $storyID)
{
if(!isset($stories[$storyID])) continue;
$story = $stories[$storyID];
/* Fix Bug #1538*/
$currentOrder = $currentOrder . $storyID . ',';
$oldOrder = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where("id")->eq($story->plan)->fetch('order');
$oldOrder = explode(',', $oldOrder);
unset($oldOrder[array_search($storyID, $oldOrder)]);
$oldOrder = implode(',', $oldOrder);
$this->dao->update(TABLE_PRODUCTPLAN)->set("order")->eq($oldOrder)->where('id')->eq($story->plan)->exec();
if($this->session->currentProductType == 'normal' or $story->branch != 0 or empty($story->plan))
{
$this->dao->update(TABLE_STORY)->set("plan")->eq($planID)->where('id')->eq((int)$storyID)->exec();
@@ -297,7 +306,10 @@ class productplanModel extends model
}
$this->action->create('story', $storyID, 'linked2plan', '', $planID);
$this->story->setStage($storyID);
}
$this->dao->update(TABLE_PRODUCTPLAN)->set("order")->eq($currentOrder)->where('id')->eq((int)$planID)->exec();
}
/**
@@ -312,6 +324,14 @@ class productplanModel extends model
$story = $this->dao->findByID($storyID)->from(TABLE_STORY)->fetch();
$plans = array_unique(explode(',', trim(str_replace(",$planID,", ',', ',' . trim($story->plan) . ','). ',')));
$this->dao->update(TABLE_STORY)->set('plan')->eq(join(',', $plans))->where('id')->eq((int)$storyID)->exec();
/* Fix Bug #1538. */
$oldOrder = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where("id")->eq($story->plan)->fetch('order');
$oldOrder = explode(',', $oldOrder);
unset($oldOrder[array_search($storyID, $oldOrder)]);
$oldOrder = implode(',', $oldOrder);
$this->dao->update(TABLE_PRODUCTPLAN)->set('order')->eq($oldOrder)->where('id')->eq($story->plan)->exec();
$this->loadModel('story')->setStage($storyID);
$this->loadModel('action')->create('story', $storyID, 'unlinkedfromplan', '', $planID);
}