diff --git a/module/task/control.php b/module/task/control.php index f55ed55380..225a1bbf1f 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -831,6 +831,7 @@ class task extends control { if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account and $task->mode == 'linear') continue; if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue; + if($task->status == 'closed') continue; $changes = $this->task->assign($taskID); if(dao::isError()) return print(js::error(dao::getError())); diff --git a/module/task/model.php b/module/task/model.php index f60cd711f2..9f00f1450c 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3582,7 +3582,7 @@ class taskModel extends model $btnClass = $task->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; - $assignToLink = helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true); + $assignToLink = $task->assignedTo == 'closed' ? '#' : helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); echo !common::hasPriv('task', 'assignTo', $task) ? "{$assignedToText}" : $assignToHtml;