summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Controller/TaskBulk.php88
-rw-r--r--app/Controller/Taskcreation.php2
-rw-r--r--app/Template/board/table_column.php12
-rw-r--r--app/Template/task_bulk/show.php27
-rw-r--r--app/Validator/TaskValidator.php26
5 files changed, 151 insertions, 4 deletions
diff --git a/app/Controller/TaskBulk.php b/app/Controller/TaskBulk.php
new file mode 100644
index 00000000..4e9d4443
--- /dev/null
+++ b/app/Controller/TaskBulk.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Kanboard\Controller;
+
+/**
+ * Class TaskBulk
+ *
+ * @package Kanboard\Controller
+ */
+class TaskBulk extends Base
+{
+ /**
+ * Show the form
+ *
+ * @param array $values
+ * @param array $errors
+ */
+ public function show(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+
+ if (empty($values)) {
+ $values = array(
+ 'swimlane_id' => $this->request->getIntegerParam('swimlane_id'),
+ 'column_id' => $this->request->getIntegerParam('column_id'),
+ 'project_id' => $project['id'],
+ );
+ }
+
+ $this->response->html($this->template->render('task_bulk/show', array(
+ 'project' => $project,
+ 'values' => $values,
+ 'errors' => $errors,
+ 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
+ 'colors_list' => $this->color->getList(),
+ 'categories_list' => $this->category->getList($project['id']),
+ )));
+ }
+
+ /**
+ * Save all tasks in the database
+ */
+ public function save()
+ {
+ $project = $this->getProject();
+ $values = $this->request->getValues();
+ list($valid, $errors) = $this->taskValidator->validateBulkCreation($values);
+
+ if ($valid) {
+ $this->createTasks($project, $values);
+ $this->response->redirect($this->helper->url->to(
+ 'Board',
+ 'show',
+ array('project_id' => $project['id']),
+ 'swimlane-'. $values['swimlane_id']
+ ), true);
+ } else {
+ $this->show($values, $errors);
+ }
+ }
+
+ /**
+ * Create all tasks
+ *
+ * @param array $project
+ * @param array $values
+ */
+ protected function createTasks(array $project, array $values)
+ {
+ $tasks = preg_split('/\r\n|[\r\n]/', $values['tasks']);
+
+ foreach ($tasks as $title) {
+ $title = trim($title);
+
+ if (! empty($title)) {
+ $this->taskCreation->create(array(
+ 'title' => $title,
+ 'column_id' => $values['column_id'],
+ 'swimlane_id' => $values['swimlane_id'],
+ 'category_id' => empty($values['category_id']) ? 0 : $values['category_id'],
+ 'owner_id' => empty($values['owner_id']) ? 0 : $values['owner_id'],
+ 'color_id' => $values['color_id'],
+ 'project_id' => $project['id'],
+ ));
+ }
+ }
+ }
+}
diff --git a/app/Controller/Taskcreation.php b/app/Controller/Taskcreation.php
index 1d8a0e29..1c9e0d82 100644
--- a/app/Controller/Taskcreation.php
+++ b/app/Controller/Taskcreation.php
@@ -79,6 +79,6 @@ class Taskcreation extends Base
));
}
- $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project['id'])));
+ $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project['id'])), true);
}
}
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index 24abdf99..e2f69036 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -35,11 +35,17 @@
<i class="fa fa-minus-square fa-fw"></i>
<a href="#" class="board-toggle-column-view" data-column-id="<?= $column['id'] ?>"><?= t('Hide this column') ?></a>
</li>
- <?php if ($this->user->hasProjectAccess('BoardPopover', 'closeColumnTasks', $column['project_id']) && $column['nb_tasks'] > 0): ?>
+ <?php if ($this->user->hasProjectAccess('Taskcreation', 'create', $column['project_id'])): ?>
<li>
- <i class="fa fa-close fa-fw"></i>
- <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+ <i class="fa fa-align-justify" aria-hidden="true"></i>
+ <?= $this->url->link(t('Create tasks in bulk'), 'TaskBulk', 'show', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
</li>
+ <?php if ($column['nb_tasks'] > 0): ?>
+ <li>
+ <i class="fa fa-close fa-fw"></i>
+ <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+ </li>
+ <?php endif ?>
<?php endif ?>
</ul>
</span>
diff --git a/app/Template/task_bulk/show.php b/app/Template/task_bulk/show.php
new file mode 100644
index 00000000..dcd505f2
--- /dev/null
+++ b/app/Template/task_bulk/show.php
@@ -0,0 +1,27 @@
+<div class="page-header">
+ <h2><?= t('Create tasks in bulk') ?></h2>
+</div>
+
+<form class="popover-form" method="post" action="<?= $this->url->href('TaskBulk', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+ <?= $this->form->csrf() ?>
+ <?= $this->form->hidden('column_id', $values) ?>
+ <?= $this->form->hidden('swimlane_id', $values) ?>
+ <?= $this->form->hidden('project_id', $values) ?>
+
+ <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
+ <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
+
+ <?= $this->form->label(t('Tasks'), 'tasks') ?>
+ <?= $this->form->textarea('tasks', $values, $errors, array(
+ 'placeholder="'.implode("\r\n", array(t('My task title'), t('My task title'), t('My task title'))).'"')
+ ) ?>
+ <p class="form-help"><?= t('Enter one task by line.') ?></p>
+
+ <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
+
+ <div class="form-actions">
+ <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+ <?= t('or') ?> <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+ </div>
+</form>
+
diff --git a/app/Validator/TaskValidator.php b/app/Validator/TaskValidator.php
index 1a77dd32..55ea8fdd 100644
--- a/app/Validator/TaskValidator.php
+++ b/app/Validator/TaskValidator.php
@@ -70,6 +70,32 @@ class TaskValidator extends Base
}
/**
+ * Validate task creation
+ *
+ * @access public
+ * @param array $values Form values
+ * @return array $valid, $errors [0] = Success or not, [1] = List of errors
+ */
+ public function validateBulkCreation(array $values)
+ {
+ $rules = array(
+ new Validators\Required('project_id', t('The project is required')),
+ new Validators\Required('tasks', t('Field required')),
+ new Validators\Required('column_id', t('Field required')),
+ new Validators\Required('swimlane_id', t('Field required')),
+ new Validators\Integer('category_id', t('This value must be an integer')),
+ new Validators\Integer('swimlane_id', t('This value must be an integer')),
+ );
+
+ $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+ return array(
+ $v->execute(),
+ $v->getErrors()
+ );
+ }
+
+ /**
* Validate description creation
*
* @access public
generated by cgit v1.2.3 (git 2.46.0) at 2025-02-17 02:28:29 +0000