diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2018-06-07 15:02:10 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2018-06-07 15:02:10 -0700 |
| commit | 9d4be201aaaeaac23f4b18fb6c91caca857a2f0f (patch) | |
| tree | 0b669aa0d7d382679100a69c0f9a59287b906568 /app/Template/task | |
| parent | dfea2f23653644b574322a5199c120a32e1f29f3 (diff) | |
Add quick link assign me in different views
Diffstat (limited to 'app/Template/task')
| -rw-r--r-- | app/Template/task/details.php | 21 | ||||
| -rw-r--r-- | app/Template/task/dropdown.php | 7 |
2 files changed, 16 insertions, 12 deletions
diff --git a/app/Template/task/details.php b/app/Template/task/details.php index cf305743..2712d49b 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -85,6 +85,9 @@ <?= t('not assigned') ?> <?php endif ?> </span> + <?php if ($editable && $task['owner_id'] != $this->user->getId()): ?> + - <span><?= $this->url->link(t('Assign to me'), 'TaskModificationController', 'assignToMe', ['task_id' => $task['id'], 'project_id' => $task['project_id']]) ?></span> + <?php endif ?> </li> <?php if ($task['creator_username']): ?> <li> @@ -116,12 +119,14 @@ <span><?= $this->dt->datetime($task['date_due']) ?></span> </li> <?php endif ?> - <?php if ($task['date_started']): ?> - <li> - <strong><?= t('Started:') ?></strong> + <li> + <strong><?= t('Started:') ?></strong> + <?php if ($task['date_started']): ?> <span><?= $this->dt->datetime($task['date_started']) ?></span> - </li> - <?php endif ?> + <?php elseif ($editable): ?> + <span><?= $this->url->link(t('Start now'), 'TaskModificationController', 'start', ['task_id' => $task['id'], 'project_id' => $task['project_id']]) ?></span> + <?php endif ?> + </li> <li> <strong><?= t('Created:') ?></strong> <span><?= $this->dt->datetime($task['date_creation']) ?></span> @@ -164,11 +169,5 @@ )) ?> <?php endif ?> - <?php if ($editable && empty($task['date_started'])): ?> - <div class="buttons-header"> - <?= $this->url->button('play', t('Set start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - </div> - <?php endif ?> - <?= $this->hook->render('template:task:details:bottom', array('task' => $task)) ?> </section> diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php index 44fe6eeb..1bad6615 100644 --- a/app/Template/task/dropdown.php +++ b/app/Template/task/dropdown.php @@ -2,9 +2,14 @@ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong>#<?= $task['id'] ?> <i class="fa fa-caret-down"></i></strong></a> <ul> <?php if ($this->projectRole->canUpdateTask($task)): ?> + <?php if (array_key_exists('owner_id', $task) && $task['owner_id'] != $this->user->getId()): ?> + <li> + <?= $this->url->icon('hand-o-right', t('Assign to me'), 'TaskModificationController', 'assignToMe', ['task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => isset($redirect) ? $redirect : '']) ?> + </li> + <?php endif ?> <?php if (array_key_exists('date_started', $task) && empty($task['date_started'])): ?> <li> - <?= $this->url->icon('play', t('Set the start date automatically'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->icon('play', t('Set the start date automatically'), 'TaskModificationController', 'start', ['task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => isset($redirect) ? $redirect : '']) ?> </li> <?php endif ?> <li> |