From b6e92cb64a5ba6c8eb5222a7732fba50e6079622 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 18:09:01 -0400
Subject: Remove dropdown menus that are now available with task edit form

---
 app/Controller/TaskModificationController.php | 51 +-----------------
 app/Controller/TaskPopoverController.php      | 74 ---------------------------
 2 files changed, 1 insertion(+), 124 deletions(-)

(limited to 'app/Controller')

diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php
index 3c526b3b..b064123a 100644
--- a/app/Controller/TaskModificationController.php
+++ b/app/Controller/TaskModificationController.php
@@ -22,55 +22,6 @@ class TaskModificationController extends BaseController
         $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
     }
 
-    /**
-     * 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
      *
@@ -93,7 +44,7 @@ class TaskModificationController extends BaseController
             $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
         }
 
-        $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,
diff --git a/app/Controller/TaskPopoverController.php b/app/Controller/TaskPopoverController.php
index bf4e23d5..4e3c11a3 100644
--- a/app/Controller/TaskPopoverController.php
+++ b/app/Controller/TaskPopoverController.php
@@ -10,80 +10,6 @@ namespace Kanboard\Controller;
  */
 class TaskPopoverController extends BaseController
 {
-    /**
-     * Change a task assignee directly from the board
-     *
-     * @access public
-     */
-    public function changeAssignee()
-    {
-        $task = $this->getTask();
-        $project = $this->projectModel->getById($task['project_id']);
-
-        $this->response->html($this->template->render('task_popover/change_assignee', array(
-            'values'     => $task,
-            'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']),
-            'project'    => $project,
-        )));
-    }
-
-    /**
-     * Validate an assignee modification
-     *
-     * @access public
-     */
-    public function updateAssignee()
-    {
-        $values = $this->request->getValues();
-
-        list($valid,) = $this->taskValidator->validateAssigneeModification($values);
-
-        if ($valid && $this->taskModificationModel->update($values)) {
-            $this->flash->success(t('Task updated successfully.'));
-        } else {
-            $this->flash->failure(t('Unable to update your task.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $values['project_id'])), true);
-    }
-
-    /**
-     * Change a task category directly from the board
-     *
-     * @access public
-     */
-    public function changeCategory()
-    {
-        $task = $this->getTask();
-        $project = $this->projectModel->getById($task['project_id']);
-
-        $this->response->html($this->template->render('task_popover/change_category', array(
-            'values'          => $task,
-            'categories_list' => $this->categoryModel->getList($project['id']),
-            'project'         => $project,
-        )));
-    }
-
-    /**
-     * Validate a category modification
-     *
-     * @access public
-     */
-    public function updateCategory()
-    {
-        $values = $this->request->getValues();
-
-        list($valid,) = $this->taskValidator->validateCategoryModification($values);
-
-        if ($valid && $this->taskModificationModel->update($values)) {
-            $this->flash->success(t('Task updated successfully.'));
-        } else {
-            $this->flash->failure(t('Unable to update your task.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $values['project_id'])), true);
-    }
-
     /**
      * Screenshot popover
      *
-- 
cgit v1.2.3