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

Use task description templates in bulk task creation

This commit is contained in:
Frederic Guillot 2017-11-03 10:57:00 -07:00
parent 78a2d3142c
commit e6f8a76a18
32 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/TaskBulkController.php
View File

@ -35,6 +35,7 @@ class TaskBulkController extends BaseController
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, $project['is_private'] == 1),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
'task_description_templates' => $this->predefinedTaskDescriptionModel->getList($project['id']),
)));
}
@ -85,8 +86,18 @@ class TaskBulkController extends BaseController
'owner_id' => empty($values['owner_id']) ? 0 : $values['owner_id'],
'color_id' => $values['color_id'],
'project_id' => $project['id'],
'description' => $this->getTaskDescription($project, $values),
));
}
}
}
protected function getTaskDescription(array $project, array $values)
{
if (empty($values['task_description_template_id'])) {
return '';
}
return $this->predefinedTaskDescriptionModel->getDescriptionById($project['id'], $values['task_description_template_id']);
}
}

1
app/Locale/bs_BA/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/ca_ES/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/cs_CZ/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/da_DK/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/de_DE/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/el_GR/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/es_ES/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/fi_FI/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/fr_FR/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
'Template removed successfully.' => 'Modèle supprimé avec succès.',
'Unable to remove this template.' => 'Impossible de supprimer ce modèle.',
'Description Templates' => 'Modèles de description',
'Template for the task description' => 'Modèle pour la description des tâches',
);

1
app/Locale/hr_HR/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/hu_HU/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/id_ID/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/it_IT/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/ja_JP/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/ko_KR/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/my_MY/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/nb_NO/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/nl_NL/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/pl_PL/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/pt_BR/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/pt_PT/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/ru_RU/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/sr_Latn_RS/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/sv_SE/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/th_TH/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/tr_TR/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/vi_VN/translations.php
View File

@ -1362,4 +1362,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

1
app/Locale/zh_CN/translations.php
View File

@ -1356,4 +1356,5 @@ return array(
// 'Template removed successfully.' => '',
// 'Unable to remove this template.' => '',
// 'Description Templates' => '',
// 'Template for the task description' => '',
);

10
app/Model/PredefinedTaskDescriptionModel.php
View File

@ -13,11 +13,21 @@ class PredefinedTaskDescriptionModel extends Base
return $this->db->table(self::TABLE)->eq('project_id', $projectId)->findAll();
}
public function getList($projectId)
{
return array('' => t('None')) + $this->db->hashtable(self::TABLE)->eq('project_id', $projectId)->getAll('id', 'title');
}
public function getById($projectId, $id)
{
return $this->db->table(self::TABLE)->eq('project_id', $projectId)->eq('id', $id)->findOne();
}
public function getDescriptionById($projectId, $id)
{
return $this->db->table(self::TABLE)->eq('project_id', $projectId)->eq('id', $id)->findOneColumn('description');
}
public function create($projectId, $title, $description)
{
return $this->db->table(self::TABLE)->persist(array(

6
app/Template/task_bulk/show.php
View File

@ -6,12 +6,16 @@
<?= $this->form->csrf() ?>
<?= $this->form->hidden('column_id', $values) ?>
<?= $this->form->hidden('swimlane_id', $values) ?>
<?= $this->form->hidden('project_id', $values) ?>
<?= $this->task->renderColorField($values) ?>
<?= $this->task->renderAssigneeField($users_list, $values, $errors) ?>
<?= $this->task->renderCategoryField($categories_list, $values, $errors) ?>
<?php if (! empty($task_description_templates)): ?>
<?= $this->form->label(t('Template for the task description'), 'task_description_template_id') ?>
<?= $this->form->select('task_description_template_id', $task_description_templates, $values, $errors) ?>
<?php endif ?>
<?= $this->form->label(t('Tasks'), 'tasks') ?>
<?= $this->form->textarea('tasks', $values, $errors, array('placeholder="'.t('My task title').'"')) ?>
<p class="form-help"><?= t('Enter one task by line.') ?></p>

1
app/Validator/TaskValidator.php
View File

@ -81,7 +81,6 @@ class TaskValidator extends BaseValidator
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')),