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

Add "Create another link" checkbox for internal link as in sub-task creation

This commit is contained in:
Olivier Maridat 2017-07-11 12:51:28 +02:00 committed by Frédéric Guillot
parent 347aff94de
commit 46974915b3
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Controller/TaskInternalLinkController.php
View File

@ -44,6 +44,13 @@ class TaskInternalLinkController extends BaseController
{
$task = $this->getTask();
if (empty($values)) {
$values = array(
'another_tasklink' => $this->request->getIntegerParam('another_tasklink', 0)
);
$values = $this->hook->merge('controller:tasklink:form:default', $values, array('default_values' => $values));
}
$this->response->html($this->template->render('task_internal_link/create', array(
'values' => $values,
'errors' => $errors,
@ -65,8 +72,18 @@ class TaskInternalLinkController extends BaseController
list($valid, $errors) = $this->taskLinkValidator->validateCreation($values);
if ($valid) {
if ($this->taskLinkModel->create($values['task_id'], $values['opposite_task_id'], $values['link_id'])) {
if ($this->taskLinkModel->create($values['task_id'], $values['opposite_task_id'], $values['link_id']) !== false) {
$this->flash->success(t('Link added successfully.'));
if (isset($values['another_tasklink']) && $values['another_tasklink'] == 1) {
return $this->create(array(
'project_id' => $task['project_id'],
'task_id' => $task['id'],
'link_id' => $values['link_id'],
'another_tasklink' => 1
));
}
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
}

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

@ -1338,4 +1338,5 @@ return array(
'This task was sent by email to "%s" with subject "%s".' => 'Cette tâche a été envoyée par courrier électronique à « %s » avec le sujet « %s ».',
'Predefined Email Subjects' => 'Sujets de courrier électronique prédéfinis',
'Write one subject by line.' => 'Écrivez un sujet par ligne.',
'Create another link' => 'Créer un autre lien',
);

2
app/Template/task_internal_link/create.php
View File

@ -25,5 +25,7 @@
),
'autocomplete') ?>
<?= $this->form->checkbox('another_tasklink', t('Create another link'), 1, isset($values['another_tasklink']) && $values['another_tasklink'] == 1) ?>
<?= $this->modal->submitButtons() ?>
</form>