diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/SubtaskRestrictionController.php | 10 | ||||
| -rw-r--r-- | app/Helper/SubtaskHelper.php | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/Controller/SubtaskRestrictionController.php b/app/Controller/SubtaskRestrictionController.php index cb642e1c..0e207674 100644 --- a/app/Controller/SubtaskRestrictionController.php +++ b/app/Controller/SubtaskRestrictionController.php @@ -46,14 +46,16 @@ class SubtaskRestrictionController extends BaseController // Change status of the previous "in progress" subtask $this->subtaskModel->update(array( - 'id' => $values['id'], - 'status' => $values['status'], + 'id' => $values['id'], + 'status' => $values['status'], + 'task_id' => $task['id'], )); // Set the current subtask to "in progress" $this->subtaskModel->update(array( - 'id' => $subtask['id'], - 'status' => SubtaskModel::STATUS_INPROGRESS, + 'id' => $subtask['id'], + 'status' => SubtaskModel::STATUS_INPROGRESS, + 'task_id' => $task['id'], )); $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); diff --git a/app/Helper/SubtaskHelper.php b/app/Helper/SubtaskHelper.php index 8e090f17..1b8b0e51 100644 --- a/app/Helper/SubtaskHelper.php +++ b/app/Helper/SubtaskHelper.php @@ -43,7 +43,7 @@ class SubtaskHelper extends Base $params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'refresh-table' => (int) $refresh_table); if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) { - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestrictionController', 'show', $params, false, 'popover'); + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestrictionController', 'show', $params, false, 'js-modal-confirm'); } $class = 'subtask-toggle-status '.($refresh_table ? 'subtask-refresh-table' : ''); |