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

* Fix bug #42386.

Browse Source
This commit is contained in:
hufangzhou
2023-12-25 11:01:53 +08:00
parent 0d5ecea9ab
commit 83377ec1ef
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+1 -1
View File
@@ -877,7 +877,7 @@ class story extends control
$story = $this->story->getById($storyID, 0, true);
$this->commonAction($storyID);
if($story->status != 'draft' and $story->status != 'changing') unset($this->config->story->edit->requiredFields);
if($story->status != 'draft' and $story->status != 'changing') $this->config->story->edit->requiredFields = '';
if(!empty($_POST))
{
module/story/model.php
+3 -4
View File
@@ -1136,7 +1136,7 @@ class storyModel extends model
if(!empty($story->plan)) $this->action->create('productplan', $story->plan, 'linkstory', '', $storyID);
}
$changed = $story->parent != $oldStory->parent;
$changed = (isset($story->parent) && $story->parent != $oldStory->parent);
if($oldStory->parent > 0)
{
$oldParentStory = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($oldStory->parent)->fetch();
@@ -1157,7 +1157,7 @@ class storyModel extends model
}
}
if($story->parent > 0)
if(isset($story->parent) && $story->parent > 0)
{
$parentStory = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($story->parent)->fetch();
$this->dao->update(TABLE_STORY)->set('parent')->eq(-1)->where('id')->eq($story->parent)->exec();
@@ -1228,8 +1228,7 @@ class storyModel extends model
if(in_array($changeStoryID, $removeStories))
{
$linkStories = str_replace(",$storyID,", ',', ",$changeStory,");
$linkStories = trim($linkStories, ',');
$this->dao->update(TABLE_STORY)->set($linkStoryField)->eq(implode(',', $linkStories))->where('id')->eq((int)$changeStoryID)->exec();
$this->dao->update(TABLE_STORY)->set($linkStoryField)->eq(trim($linkStories, ','))->where('id')->eq((int)$changeStoryID)->exec();
}
}