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

Improve task controller and fix bug description popover

Browse Source
This commit is contained in:
Frédéric Guillot
2014-09-01 21:10:27 -08:00
parent 457e181ffb
commit 7bb09c3f9b
9 changed files with 101 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
app/Controller/Task.php
View File

@@ -233,27 +233,21 @@ class Task extends Base
*/
public function close()
{
$this->checkCSRFParam();
$task = $this->getTask();
if ($this->task->close($task['id'])) {
$this->session->flash(t('Task closed successfully.'));
} else {
$this->session->flashError(t('Unable to close this task.'));
if ($this->request->getStringParam('confirmation') === 'yes') {
$this->checkCSRFParam();
if ($this->task->close($task['id'])) {
$this->session->flash(t('Task closed successfully.'));
} else {
$this->session->flashError(t('Unable to close this task.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
/**
* Confirmation dialog before to close a task
*
* @access public
*/
public function confirmClose()
{
$task = $this->getTask();
$this->response->html($this->taskLayout('task_close', array(
'task' => $task,
'menu' => 'tasks',
@@ -268,27 +262,21 @@ class Task extends Base
*/
public function open()
{
$this->checkCSRFParam();
$task = $this->getTask();
if ($this->task->open($task['id'])) {
$this->session->flash(t('Task opened successfully.'));
} else {
$this->session->flashError(t('Unable to open this task.'));
if ($this->request->getStringParam('confirmation') === 'yes') {
$this->checkCSRFParam();
if ($this->task->open($task['id'])) {
$this->session->flash(t('Task opened successfully.'));
} else {
$this->session->flashError(t('Unable to open this task.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
/**
* Confirmation dialog before to open a task
*
* @access public
*/
public function confirmOpen()
{
$task = $this->getTask();
$this->response->html($this->taskLayout('task_open', array(
'task' => $task,
'menu' => 'tasks',
@@ -303,27 +291,21 @@ class Task extends Base
*/
public function remove()
{
$this->checkCSRFParam();
$task = $this->getTask();
if ($this->task->remove($task['id'])) {
$this->session->flash(t('Task removed successfully.'));
} else {
$this->session->flashError(t('Unable to remove this task.'));
if ($this->request->getStringParam('confirmation') === 'yes') {
$this->checkCSRFParam();
if ($this->task->remove($task['id'])) {
$this->session->flash(t('Task removed successfully.'));
} else {
$this->session->flashError(t('Unable to remove this task.'));
}
$this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
}
$this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
}
/**
* Confirmation dialog before removing a task
*
* @access public
*/
public function confirmRemove()
{
$task = $this->getTask();
$this->response->html($this->taskLayout('task_remove', array(
'task' => $task,
'menu' => 'tasks',
@@ -366,20 +348,49 @@ class Task extends Base
*
* @access public
*/
public function editDescription()
public function description()
{
$task = $this->getTask();
$ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax');
if ($this->request->isPost()) {
$values = $this->request->getValues();
list($valid, $errors) = $this->task->validateDescriptionCreation($values);
if ($valid) {
if ($this->task->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
$this->session->flashError(t('Unable to update your task.'));
}
if ($ajax) {
$this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
}
else {
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
}
}
else {
$values = $task;
$errors = array();
}
$params = array(
'values' => $task,
'errors' => array(),
'values' => $values,
'errors' => $errors,
'task' => $task,
'ajax' => $this->request->isAjax(),
'ajax' => $ajax,
'menu' => 'tasks',
'title' => t('Edit the description'),
);
if ($this->request->isAjax()) {
if ($ajax) {
$this->response->html($this->template->load('task_edit_description', $params));
}
else {
@@ -387,44 +398,6 @@ class Task extends Base
}
}
/**
* Save and validation the description
*
* @access public
*/
public function saveDescription()
{
$task = $this->getTask();
$values = $this->request->getValues();
list($valid, $errors) = $this->task->validateDescriptionCreation($values);
if ($valid) {
if ($this->task->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
$this->session->flashError(t('Unable to update your task.'));
}
if ($this->request->getIntegerParam('ajax')) {
$this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
}
else {
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
}
$this->response->html($this->taskLayout('task_edit_description', array(
'values' => $values,
'errors' => $errors,
'task' => $task,
'menu' => 'tasks',
'title' => t('Edit the description')
)));
}
/**
* Move a task to another project
*