diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Model/TaskFinder.php | 1 | ||||
| -rw-r--r-- | app/Template/task_duplication/copy.php | 5 | ||||
| -rw-r--r-- | app/Template/task_duplication/move.php | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index a16cb69f..6cf79d1f 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -248,6 +248,7 @@ class TaskFinder extends Base project_has_categories.name AS category_name, swimlanes.name AS swimlane_name, projects.name AS project_name, + projects.default_swimlane, columns.title AS column_title, users.username AS assignee_username, users.name AS assignee_name, diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php index f9106c1d..63ecb534 100644 --- a/app/Template/task_duplication/copy.php +++ b/app/Template/task_duplication/copy.php @@ -20,18 +20,23 @@ array('data-redirect="'.$this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), 'task-reload-project-destination' ) ?> + <span class="loading-icon" style="display: none"> <i class="fa fa-spinner fa-spin"></i></span> <?= $this->form->label(t('Swimlane'), 'swimlane_id') ?> <?= $this->form->select('swimlane_id', $swimlanes_list, $values) ?> + <p class="form-help"><?= t('Current swimlane: %s', $task['swimlane_name'] ?: $task['default_swimlane']) ?></p> <?= $this->form->label(t('Column'), 'column_id') ?> <?= $this->form->select('column_id', $columns_list, $values) ?> + <p class="form-help"><?= t('Current column: %s', $task['column_title']) ?></p> <?= $this->form->label(t('Category'), 'category_id') ?> <?= $this->form->select('category_id', $categories_list, $values) ?> + <p class="form-help"><?= t('Current category: %s', $task['category_name'] ?: e('no category')) ?></p> <?= $this->form->label(t('Assignee'), 'owner_id') ?> <?= $this->form->select('owner_id', $users_list, $values) ?> + <p class="form-help"><?= t('Current assignee: %s', ($task['assignee_name'] ?: $task['assignee_username']) ?: e('not assigned')) ?></p> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php index e90424a2..8613fce3 100644 --- a/app/Template/task_duplication/move.php +++ b/app/Template/task_duplication/move.php @@ -20,18 +20,23 @@ array('data-redirect="'.$this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), 'task-reload-project-destination' ) ?> + <span class="loading-icon" style="display: none"> <i class="fa fa-spinner fa-spin"></i></span> <?= $this->form->label(t('Swimlane'), 'swimlane_id') ?> <?= $this->form->select('swimlane_id', $swimlanes_list, $values) ?> + <p class="form-help"><?= t('Current swimlane: %s', $task['swimlane_name'] ?: $task['default_swimlane']) ?></p> <?= $this->form->label(t('Column'), 'column_id') ?> <?= $this->form->select('column_id', $columns_list, $values) ?> + <p class="form-help"><?= t('Current column: %s', $task['column_title']) ?></p> <?= $this->form->label(t('Category'), 'category_id') ?> <?= $this->form->select('category_id', $categories_list, $values) ?> + <p class="form-help"><?= t('Current category: %s', $task['category_name'] ?: e('no category')) ?></p> <?= $this->form->label(t('Assignee'), 'owner_id') ?> <?= $this->form->select('owner_id', $users_list, $values) ?> + <p class="form-help"><?= t('Current assignee: %s', ($task['assignee_name'] ?: $task['assignee_username']) ?: e('not assigned')) ?></p> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> |