fix bug #2939,#2912

Finish the task #6901
This commit is contained in:
leiyong
2020-02-18 14:43:31 +08:00
parent 4214b8910b
commit e9e500efb2
7 changed files with 9 additions and 11 deletions
+1 -1
View File
@@ -2651,7 +2651,7 @@ class taskModel extends model
$canBatchAssignTo = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null);
$canBatchAction = $canBatchEdit or $canBatchClose or $canBatchCancel or $canBatchChangeModule or $canBatchAssignTo;
$storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);
$storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));
$canView = common::hasPriv('task', 'view');
$taskLink = helper::createLink('task', 'view', "taskID=$task->id");