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

Add quick link assign me in different views

Browse Source
This commit is contained in:
Frédéric Guillot
2018-06-07 15:02:10 -07:00
parent dfea2f2365
commit 9d4be201aa
41 changed files with 94 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Template/board/task_private.php
View File

@@ -18,7 +18,7 @@
<div class="task-board-collapsed">
<div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse"></i></div>
<?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
<?= $this->render('task/dropdown', array('task' => $task)) ?>
<?= $this->render('task/dropdown', array('task' => $task, 'redirect' => 'board')) ?>
<?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
<?php else: ?>
<strong><?= '#'.$task['id'] ?></strong>
@@ -36,7 +36,7 @@
<div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse fa-2x"></i></div>
<div class="task-board-header">
<?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
<?= $this->render('task/dropdown', array('task' => $task)) ?>
<?= $this->render('task/dropdown', array('task' => $task, 'redirect' => 'board')) ?>
<?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
<?php else: ?>
<strong><?= '#'.$task['id'] ?></strong>

1
app/Template/dashboard/overview.php
View File

@@ -63,6 +63,7 @@
<div class="table-list-row color-<?= $task['color_id'] ?>">
<?= $this->render('task_list/task_title', array(
'task' => $task,
'redirect' => 'dashboard',
)) ?>
<?= $this->render('task_list/task_details', array(

1
app/Template/dashboard/tasks.php
View File

@@ -13,6 +13,7 @@
<div class="table-list-row color-<?= $task['color_id'] ?>">
<?= $this->render('task_list/task_title', array(
'task' => $task,
'redirect' => 'dashboard-tasks',
)) ?>
<?= $this->render('task_list/task_details', array(

21
app/Template/task/details.php
View File

@@ -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>

7
app/Template/task/dropdown.php
View File

@@ -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>

1
app/Template/task_list/listing.php
View File

@@ -15,6 +15,7 @@
<?= $this->render('task_list/task_title', array(
'task' => $task,
'show_items_selection' => true,
'redirect' => 'list',
)) ?>
<?= $this->render('task_list/task_details', array(

2
app/Template/task_list/task_title.php
View File

@@ -3,7 +3,7 @@
<?php if (isset($show_items_selection)): ?>
<input type="checkbox" data-list-item="selectable" name="tasks[]" value="<?= $task['id'] ?>">
<?php endif ?>
<?= $this->render('task/dropdown', array('task' => $task)) ?>
<?= $this->render('task/dropdown', array('task' => $task, 'redirect' => isset($redirect) ? $redirect : '')) ?>
<?php else: ?>
<strong><?= '#'.$task['id'] ?></strong>
<?php endif ?>