diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-01-30 22:25:16 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-01-30 22:25:16 -0500 |
| commit | bb040cfb78d53696edd63bf256d0fd8ba3ccdbfa (patch) | |
| tree | 811d150fddd6220faabb3c1ea1743ffd7f781e45 /app/Template/task_external_link | |
| parent | 4a52d327f7e555c336a428c457cf40c3d97bfab3 (diff) | |
Simplify code to handle ajax popover and redirects
Diffstat (limited to 'app/Template/task_external_link')
| -rw-r--r-- | app/Template/task_external_link/create.php | 2 | ||||
| -rw-r--r-- | app/Template/task_external_link/edit.php | 2 | ||||
| -rw-r--r-- | app/Template/task_external_link/find.php | 8 |
3 files changed, 4 insertions, 8 deletions
diff --git a/app/Template/task_external_link/create.php b/app/Template/task_external_link/create.php index 3179d6af..b62abdb2 100644 --- a/app/Template/task_external_link/create.php +++ b/app/Template/task_external_link/create.php @@ -2,7 +2,7 @@ <h2><?= t('Add a new external link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?> <div class="form-actions"> diff --git a/app/Template/task_external_link/edit.php b/app/Template/task_external_link/edit.php index cf9ddfed..8caaaebe 100644 --- a/app/Template/task_external_link/edit.php +++ b/app/Template/task_external_link/edit.php @@ -2,7 +2,7 @@ <h2><?= t('Edit external link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?> <div class="form-actions"> diff --git a/app/Template/task_external_link/find.php b/app/Template/task_external_link/find.php index a2304014..36a031d3 100644 --- a/app/Template/task_external_link/find.php +++ b/app/Template/task_external_link/find.php @@ -2,7 +2,7 @@ <h2><?= t('Add a new external link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('task_id', array('task_id' => $task['id'])) ?> @@ -23,10 +23,6 @@ <div class="form-actions"> <input type="submit" value="<?= t('Next') ?>" class="btn btn-blue"/> <?= t('or') ?> - <?php if ($ajax): ?> - <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $task['project_id']), false, 'close-popover') ?> - <?php else: ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - <?php endif ?> + <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form>
\ No newline at end of file |