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

* [bug#63790,done,0.3h] remove changed status when the status is closed or cancel.

Browse Source
This commit is contained in:
tianshujie
2025-07-11 09:46:38 +08:00
committed by wangzemei
parent 326c5eff3f
commit 0a02b34ea7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+2 -2
View File
@@ -2090,7 +2090,7 @@ class executionModel extends model
/* Story changed or not. */
$task->storyVersion = zget($storyVersionPairs, $task->id, $task->storyVersion);
$task->needConfirm = false;
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && !in_array($task->status, array('cancel', 'closed')) && $task->latestStoryVersion > $task->storyVersion)
{
$task->needConfirm = true;
$task->status = 'changed';
@@ -5015,7 +5015,7 @@ class executionModel extends model
}
$task->needConfirm = false;
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && !in_array($task->status, array('closed', 'cancel')) && $task->latestStoryVersion > $task->storyVersion)
{
$task->needConfirm = true;
$task->rawStatus = $task->status;
module/programplan/model.php
+1 -1
View File
@@ -945,7 +945,7 @@ class programplanModel extends model
/* Story changed or not. */
$task->storyVersion = zget($storyVersionPairs, $task->id, $task->storyVersion);
$task->needConfirm = false;
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && !in_array($task->status, array('cancel', 'closed')) && $task->latestStoryVersion > $task->storyVersion)
{
$task->needConfirm = true;
$task->status = 'changed';
module/task/model.php
+1 -1
View File
@@ -2780,7 +2780,7 @@ class taskModel extends model
/* Story changed or not. */
$task->needConfirm = false;
if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
if(!empty($task->storyStatus) && !in_array($task->status, array('cancel', 'closed')) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
{
$task->needConfirm = true;
$task->rawStatus = $task->status;