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

Improve task creation popover

Browse Source
This commit is contained in:
Frédéric Guillot
2014-11-25 20:59:46 -05:00
parent 5de091ea28
commit d534f9fbbc
2 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Controller/Task.php
View File

@@ -86,20 +86,25 @@ class Task extends Base
* *
* @access public * @access public
*/ */
public function create() public function create(array $values = array(), array $errors = array())
{ {
$project = $this->getProject(); $project = $this->getProject();
$method = $this->request->isAjax() ? 'load' : 'layout'; $method = $this->request->isAjax() ? 'load' : 'layout';
$this->response->html($this->template->$method('task_new', array( if (empty($values)) {
'errors' => array(),
'values' => array( $values = array(
'project_id' => $project['id'],
'column_id' => $this->request->getIntegerParam('column_id'), 'column_id' => $this->request->getIntegerParam('column_id'),
'color_id' => $this->request->getStringParam('color_id'), 'color_id' => $this->request->getStringParam('color_id'),
'owner_id' => $this->request->getIntegerParam('owner_id'), 'owner_id' => $this->request->getIntegerParam('owner_id'),
'another_task' => $this->request->getIntegerParam('another_task'), 'another_task' => $this->request->getIntegerParam('another_task'),
), );
}
$this->response->html($this->template->$method('task_new', array(
'ajax' => $this->request->isAjax(),
'errors' => $errors,
'values' => $values + array('project_id' => $project['id']),
'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE), 'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
'columns_list' => $this->board->getColumnsList($project['id']), 'columns_list' => $this->board->getColumnsList($project['id']),
'users_list' => $this->projectPermission->getMemberList($project['id'], true, false, true), 'users_list' => $this->projectPermission->getMemberList($project['id'], true, false, true),
@@ -122,7 +127,7 @@ class Task extends Base
$values = $this->request->getValues(); $values = $this->request->getValues();
$values['creator_id'] = $this->acl->getUserId(); $values['creator_id'] = $this->acl->getUserId();
$this->checkProjectPermissions($values['project_id']); $this->checkProjectPermissions($project['id']);
list($valid, $errors) = $this->taskValidator->validateCreation($values); list($valid, $errors) = $this->taskValidator->validateCreation($values);
@@ -145,18 +150,7 @@ class Task extends Base
} }
} }
$this->response->html($this->template->layout('task_new', array( $this->create($values, $errors);
'errors' => $errors,
'values' => $values,
'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
'columns_list' => $this->board->getColumnsList($project['id']),
'users_list' => $this->projectPermission->getMemberList($project['id']),
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($project['id']),
'date_format' => $this->config->get('application_date_format'),
'date_formats' => $this->dateParser->getAvailableFormats(),
'title' => $project['name'].' > '.t('New task')
)));
} }
/** /**

9
app/Template/task_new.php
View File

@@ -1,9 +1,15 @@
<section id="main"> <?php if (! $ajax): ?>
<div class="page-header"> <div class="page-header">
<ul> <ul>
<li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $values['project_id'])) ?></li> <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $values['project_id'])) ?></li>
</ul> </ul>
</div> </div>
<?php else: ?>
<div class="page-header">
<h2><?= t('New task') ?></h2>
</div>
<?php endif ?>
<section id="task-section"> <section id="task-section">
<form method="post" action="<?= Helper\u('task', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off"> <form method="post" action="<?= Helper\u('task', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off">
@@ -71,4 +77,3 @@
</div> </div>
</form> </form>
</section> </section>
</section>