Merge https://github.com/kanboard/kanboard

1 files changed, 18 insertions, 56 deletions

diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php
index f9c63c12..cbc3777a 100644
--- a/app/Controller/TaskModificationController.php
+++ b/app/Controller/TaskModificationController.php
@@ -23,55 +23,6 @@ class TaskModificationController extends BaseController
     }
 
     /**
-     * Edit description form
-     *
-     * @access public
-     * @param array $values
-     * @param array $errors
-     * @throws \Kanboard\Core\Controller\AccessForbiddenException
-     * @throws \Kanboard\Core\Controller\PageNotFoundException
-     */
-    public function description(array $values = array(), array $errors = array())
-    {
-        $task = $this->getTask();
-
-        if (empty($values)) {
-            $values = array('id' => $task['id'], 'description' => $task['description']);
-        }
-
-        $this->response->html($this->template->render('task_modification/edit_description', array(
-            'values' => $values,
-            'errors' => $errors,
-            'task' => $task,
-        )));
-    }
-
-    /**
-     * Update description
-     *
-     * @access public
-     */
-    public function updateDescription()
-    {
-        $task = $this->getTask();
-        $values = $this->request->getValues();
-
-        list($valid, $errors) = $this->taskValidator->validateDescriptionCreation($values);
-
-        if ($valid) {
-            if ($this->taskModificationModel->update($values)) {
-                $this->flash->success(t('Task updated successfully.'));
-            } else {
-                $this->flash->failure(t('Unable to update your task.'));
-            }
-
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
-        }
-
-        return $this->description($values, $errors);
-    }
-
-    /**
      * Display a form to edit a task
      *
      * @access public
@@ -86,20 +37,16 @@ class TaskModificationController extends BaseController
         $project = $this->projectModel->getById($task['project_id']);
 
         if (empty($values)) {
-            $values = $task;
-            $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
-            $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
-            $values = $this->dateParser->format($values, array('date_due'), $this->dateParser->getUserDateFormat());
-            $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
+            $values = $this->prepareValues($task);
         }
 
-        $this->response->html($this->template->render('task_modification/edit_task', array(
+        $this->response->html($this->template->render('task_modification/show', array(
             'project' => $project,
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
+            'tags' => $this->taskTagModel->getList($task['id']),
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($task['project_id']),
         )));
     }
@@ -124,4 +71,19 @@ class TaskModificationController extends BaseController
             $this->edit($values, $errors);
         }
     }
+
+    /**
+     * Prepare form values
+     *
+     * @access protected
+     * @param  array $task
+     * @return array
+     */
+    protected function prepareValues(array $task)
+    {
+        $values = $task;
+        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
+        $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
+        return $values;
+    }
 }