AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dropdown menus that are now available with task edit form

Browse Source
This commit is contained in:
Frederic Guillot
2016-06-24 18:09:01 -04:00
parent 17213da5ce
commit b6e92cb64a
11 changed files with 2 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/Controller/TaskModificationController.php
View File

@@ -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,

74
app/Controller/TaskPopoverController.php
View File

@@ -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
*