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

Use popover to edit task and description directly from board.

Browse Source 
- Click on 'description' icon opens the 'edit-description' page.
- Edit task and edit description now open in popover, like the assign
dialog.
This commit is contained in:
Francois Ferrand
2014-06-26 15:52:39 +02:00
parent 06d0b7048e
commit 6d65cfd883
5 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/Controller/Task.php
View File

@@ -162,17 +162,24 @@ class Task extends Base
$task['score'] = $task['score'] ?: '';
$this->response->html($this->template->layout('task_edit', array(
'values' => $task,
'errors' => array(),
'task' => $task,
'columns_list' => $this->board->getColumnsList($task['project_id']),
'users_list' => $this->project->getUsersList($task['project_id']),
'colors_list' => $this->task->getColors(),
'categories_list' => $this->category->getList($task['project_id']),
'menu' => 'tasks',
'title' => t('Edit a task')
)));
$params = array(
'values' => $task,
'errors' => array(),
'task' => $task,
'columns_list' => $this->board->getColumnsList($task['project_id']),
'users_list' => $this->project->getUsersList($task['project_id']),
'colors_list' => $this->task->getColors(),
'categories_list' => $this->category->getList($task['project_id']),
'ajax' => $this->request->isAjax(),
'menu' => 'tasks',
'title' => t('Edit a task')
);
if ($this->request->isAjax()) {
$this->response->html($this->template->load('task_edit', $params));
}
else {
$this->response->html($this->template->layout('task_edit', $params));
}
}
/**
@@ -191,7 +198,13 @@ class Task extends Base
if ($this->task->update($values)) {
$this->session->flash(t('Task updated successfully.'));
$this->response->redirect('?controller=task&action=show&task_id='.$values['id']);
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='.$values['id']);
}
}
else {
$this->session->flashError(t('Unable to update your task.'));
@@ -357,13 +370,20 @@ class Task extends Base
{
$task = $this->getTask();
$this->response->html($this->taskLayout('task_edit_description', array(
'values' => $task,
'errors' => array(),
'task' => $task,
'menu' => 'tasks',
'title' => t('Edit the description')
)));
$params = array(
'values' => $task,
'errors' => array(),
'task' => $task,
'ajax' => $this->request->isAjax(),
'menu' => 'tasks',
'title' => t('Edit the description')
);
if ($this->request->isAjax()) {
$this->response->html($this->template->load('task_edit_description', $params));
}
else {
$this->response->html($this->taskLayout('task_edit_description', $params));
}
}
/**
@@ -387,7 +407,12 @@ class Task extends Base
$this->session->flashError(t('Unable to update your task.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
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(