* Fix bug #3529.
This commit is contained in:
+7
-10
@@ -1383,17 +1383,14 @@ class storyModel extends model
|
||||
$story->plan = trim(str_replace(",$oldPlanID,", ',', ",$oldStory->plan,"), ',');
|
||||
if(empty($story->branch)) $story->plan .= ",$planID";
|
||||
}
|
||||
if($planID and $this->session->currentProductType != 'normal' and $oldStory->branch == 0)
|
||||
if($planID and $this->session->currentProductType != 'normal' and $oldStory->branch == 0 and !isset($oldStoryStages[$storyID][$plan->branch]))
|
||||
{
|
||||
if(!isset($oldStoryStages[$storyID][$plan->branch]))
|
||||
{
|
||||
$story->stage = 'planned';
|
||||
$newStoryStage = new stdclass();
|
||||
$newStoryStage->story = $storyID;
|
||||
$newStoryStage->branch = $plan->branch;
|
||||
$newStoryStage->stage = $story->stage;
|
||||
$this->dao->insert(TABLE_STORYSTAGE)->data($newStoryStage)->autoCheck()->exec();
|
||||
}
|
||||
$story->stage = 'planned';
|
||||
$newStoryStage = new stdclass();
|
||||
$newStoryStage->story = $storyID;
|
||||
$newStoryStage->branch = $plan->branch;
|
||||
$newStoryStage->stage = $story->stage;
|
||||
$this->dao->insert(TABLE_STORYSTAGE)->data($newStoryStage)->autoCheck()->exec();
|
||||
}
|
||||
|
||||
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
|
||||
|
||||
Reference in New Issue
Block a user