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

* Fix bug #38219.

Browse Source
This commit is contained in:
hufangzhou
2023-09-07 09:27:46 +00:00
parent 2ac9ef7bb7
commit d470d7ce51
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+4 -5
View File
@@ -6192,7 +6192,8 @@ class storyModel extends model
if(isset($story->finalResult))
{
if($story->finalResult == 'reject') $this->action->create('story', $story->id, 'ReviewRejected');
$isChanged = $story->changedBy ? true : false;
if($story->finalResult == 'reject') $this->action->create('story', $story->id, 'ReviewRejected', '', $isChanged ? 'changing' : 'draft');
if($story->finalResult == 'pass') $this->action->create('story', $story->id, 'ReviewPassed');
if($story->finalResult == 'clarify') $this->action->create('story', $story->id, 'ReviewClarified');
if($story->finalResult == 'revert') $this->action->create('story', $story->id, 'ReviewReverted');
@@ -6522,10 +6523,8 @@ class storyModel extends model
->fetch();
$lastAction = $lastRecord->action;
if(strpos(',closed,reviewrejected,', ",$lastAction,") !== false)
{
$status = strpos($lastRecord->extra, '|') !== false ? substr($lastRecord->extra, strpos($lastRecord->extra, '|') + 1) : 'active';
}
if($lastAction == 'reviewrejected') $status = $lastRecord->extra;
if($lastAction == 'closed') $status = strpos($lastRecord->extra, '|') !== false ? substr($lastRecord->extra, strpos($lastRecord->extra, '|') + 1) : 'active';
/* Activate parent story. */
if($lastAction == 'closedbysystem')