summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-08-22 20:30:23 -0400
committerFrederic Guillot <fred@kanboard.net>2015-08-22 20:30:23 -0400
commit89ca0908014413e17adf73de55ff1731b9729706 (patch)
tree14bdda464046294c9f6fccd21f22aae75a50ee09
parentcd9bc86fbeea01fa492606b9c19ded36bf0ab366 (diff)
Add milestone marker in board task
-rw-r--r--ChangeLog1
-rw-r--r--app/Model/TaskFinder.php1
-rw-r--r--app/Template/board/task_footer.php6
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b1978d84..915b83d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ New features:
* Add config parameter to disable/enable RememberMe authentication
* Add start/end date for projects
* Add new automated action to change task color based on the task link
+* Add milestone marker in board task
* Add Portuguese (European) translation
* Add Norwegian translation
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index b98e3bd5..15274707 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -93,6 +93,7 @@ class TaskFinder extends Base
'(SELECT count(*) FROM '.Subtask::TABLE.' WHERE '.Subtask::TABLE.'.task_id=tasks.id) AS nb_subtasks',
'(SELECT count(*) FROM '.Subtask::TABLE.' WHERE '.Subtask::TABLE.'.task_id=tasks.id AND status=2) AS nb_completed_subtasks',
'(SELECT count(*) FROM '.TaskLink::TABLE.' WHERE '.TaskLink::TABLE.'.task_id = tasks.id) AS nb_links',
+ '(SELECT 1 FROM '.TaskLink::TABLE.' WHERE '.TaskLink::TABLE.'.task_id = tasks.id AND '.TaskLink::TABLE.'.link_id = 9) AS is_milestone',
'tasks.id',
'tasks.reference',
'tasks.title',
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index cadcb2d6..2944db06 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -63,4 +63,10 @@
<?php if (! empty($task['time_estimated'])): ?>
<span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->e($task['time_estimated']).'h' ?></span>
<?php endif ?>
+
+ <?php if ($task['is_milestone'] == 1): ?>
+ <span title="<?= t('Milestone') ?>">
+ <i class="fa fa-flag"></i>
+ </span>
+ <?php endif ?>
</div>