Added generic controller for task popovers

4 files changed, 1 insertions, 59 deletions

diff --git a/app/Template/board/popover_assignee.php b/app/Template/board/popover_assignee.php
deleted file mode 100644
index 87e16816..00000000
--- a/app/Template/board/popover_assignee.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('BoardPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-
-        <?= $this->task->selectAssignee($users_list, $values, array(), array('autofocus')) ?>
-
-        <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>
-</section>
\ No newline at end of file
diff --git a/app/Template/board/popover_category.php b/app/Template/board/popover_category.php
deleted file mode 100644
index e3794760..00000000
--- a/app/Template/board/popover_category.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('BoardPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-
-        <?= $this->task->selectCategory($categories_list, $values, array(), array('autofocus'), true) ?>
-
-        <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>
-</section>
\ No newline at end of file
diff --git a/app/Template/board/popover_close_all_tasks_column.php b/app/Template/board/popover_close_all_tasks_column.php
deleted file mode 100644
index 5090f499..00000000
--- a/app/Template/board/popover_close_all_tasks_column.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Do you really want to close all tasks of this column?') ?></h2>
-    </div>
-    <form method="post" action="<?= $this->url->href('BoardPopover', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
-        <?= $this->form->csrf() ?>
-        <?= $this->form->hidden('column_id', $values) ?>
-        <?= $this->form->hidden('swimlane_id', $values) ?>
-
-        <p class="alert"><?= t('%d task(s) in the column "%s" and the swimlane "%s" will be closed.', $nb_tasks, $column, $swimlane) ?></p>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-red"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
-        </div>
-    </form>
-</section>
\ No newline at end of file
diff --git a/app/Template/board/task_avatar.php b/app/Template/board/task_avatar.php
index 39f6b54d..53739b19 100644
--- a/app/Template/board/task_avatar.php
+++ b/app/Template/board/task_avatar.php
@@ -3,7 +3,7 @@
     <span
         <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
         class="task-board-assignee task-board-change-assignee"
-        data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-url="<?= $this->url->href('TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <?php else: ?>
         class="task-board-assignee">
     <?php endif ?>