1 files changed, 45 insertions, 20 deletions

diff --git a/app/Controller/SubtaskController.php b/app/Controller/SubtaskController.php
index 5fa55f6b..d5db9b2e 100644
--- a/app/Controller/SubtaskController.php
+++ b/app/Controller/SubtaskController.php
@@ -66,29 +66,51 @@ class SubtaskController extends BaseController
     {
         $task = $this->getTask();
         $values = $this->request->getValues();
+        $values['task_id'] = $task['id'];
+        $subtasks = explode("\r\n", isset($values['title']) ? $values['title'] : '');
+        $subtasksAdded = 0;
 
-        list($valid, $errors) = $this->subtaskValidator->validateCreation($values);
+        foreach ($subtasks as $subtask) {
+            $subtask = trim($subtask);
 
-        if ($valid) {
-            if ($this->subtaskModel->create($values) !== false) {
-                $this->flash->success(t('Sub-task added successfully.'));
-            } else {
-                $this->flash->failure(t('Unable to create your sub-task.'));
-            }
+            if (! empty($subtask)) {
+                $subtaskValues = $values;
+                $subtaskValues['title'] = $subtask;
+
+                list($valid, $errors) = $this->subtaskValidator->validateCreation($subtaskValues);
+
+                if (! $valid) {
+                    $this->create($values, $errors);
+                    return false;
+                }
 
-            if (isset($values['another_subtask']) && $values['another_subtask'] == 1) {
-                return $this->create(array(
-                    'project_id' => $task['project_id'],
-                    'task_id' => $task['id'],
-                    'user_id' => $values['user_id'],
-                    'another_subtask' => 1
-                ));
+                if (! $this->subtaskModel->create($subtaskValues)) {
+                    $this->flash->failure(t('Unable to create your sub-task.'));
+                    $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true);
+                    return false;
+                }
+
+                $subtasksAdded++;
             }
+        }
 
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true);
+        if (isset($values['another_subtask']) && $values['another_subtask'] == 1) {
+            return $this->create(array(
+                'project_id' => $task['project_id'],
+                'task_id' => $task['id'],
+                'user_id' => $values['user_id'],
+                'another_subtask' => 1,
+                'subtasks_added' => $subtasksAdded,
+            ));
+        } else if ($subtasksAdded > 0) {
+            if ($subtasksAdded === 1) {
+                $this->flash->success(t('Subtask added successfully.'));
+            } else {
+                $this->flash->success(t('%d subtasks added successfully.', $subtasksAdded));
+            }
         }
 
-        return $this->create($values, $errors);
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true);
     }
 
     /**
@@ -103,7 +125,7 @@ class SubtaskController extends BaseController
     public function edit(array $values = array(), array $errors = array())
     {
         $task = $this->getTask();
-        $subtask = $this->getSubtask();
+        $subtask = $this->getSubtask($task);
 
         $this->response->html($this->template->render('subtask/edit', array(
             'values' => empty($values) ? $subtask : $values,
@@ -123,9 +145,12 @@ class SubtaskController extends BaseController
     public function update()
     {
         $task = $this->getTask();
-        $this->getSubtask();
+        $subtask = $this->getSubtask($task);
 
         $values = $this->request->getValues();
+        $values['id'] = $subtask['id'];
+        $values['task_id'] = $task['id'];
+
         list($valid, $errors) = $this->subtaskValidator->validateModification($values);
 
         if ($valid) {
@@ -149,7 +174,7 @@ class SubtaskController extends BaseController
     public function confirm()
     {
         $task = $this->getTask();
-        $subtask = $this->getSubtask();
+        $subtask = $this->getSubtask($task);
 
         $this->response->html($this->template->render('subtask/remove', array(
             'subtask' => $subtask,
@@ -166,7 +191,7 @@ class SubtaskController extends BaseController
     {
         $this->checkCSRFParam();
         $task = $this->getTask();
-        $subtask = $this->getSubtask();
+        $subtask = $this->getSubtask($task);
 
         if ($this->subtaskModel->remove($subtask['id'])) {
             $this->flash->success(t('Sub-task removed successfully.'));