diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 5d4c1e7f91..cd9690c021 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -73,11 +73,11 @@ js::set('browseType', $browseType); echo "'; if($withSearch) echo ""; @@ -114,7 +114,7 @@ js::set('browseType', $browseType); foreach ($memberPairs as $key => $value) { if(empty($key)) continue; - echo "
  • " . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '
  • '; + echo "
  • " . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\", \"hiddenwin\", \"#moreAction\")", $value, '', '') . '
  • '; } echo ""; if($withSearch) echo ""; diff --git a/module/task/control.php b/module/task/control.php index b5d0e63ba2..4beb48389d 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -473,6 +473,7 @@ class task extends control $taskIDList = $this->post->taskIDList; unset($_POST['taskIDList']); if(!is_array($taskIDList)) die(js::locate($this->createLink('project', 'task', "projectID=$project"), 'parent')); + $taskIDList = array_unique($taskIDList); foreach($taskIDList as $taskID) { $this->loadModel('action'); @@ -482,7 +483,7 @@ class task extends control $this->action->logHistory($actionID, $changes); $this->task->sendmail($taskID, $actionID); } - die(js::locate($this->createLink('project', 'task', "projectID=$project"), 'parent')); + die(js::reload('parent')); } } diff --git a/module/task/model.php b/module/task/model.php index 35401a9079..b74b5e646c 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -519,7 +519,7 @@ class taskModel extends model ->cleanFloat('left') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) - ->remove('comment') + ->remove('comment,showModule') ->setDefault('assignedDate', $now) ->get();