From 0ebdd4ddfd898628cc30e34e55e97f88e5e30a71 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Fri, 2 Jan 2015 21:48:26 -0500
Subject: Cleanup and fixes
---
app/Template/app/subtasks.php | 4 ++--
app/Template/app/tasks.php | 4 ++--
app/Template/board/filters.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'app/Template')
diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php
index 47d4782c..7081b174 100644
--- a/app/Template/app/subtasks.php
+++ b/app/Template/app/subtasks.php
@@ -12,7 +12,7 @@
<?php foreach ($subtasks as $subtask): ?>
<tr>
<td class="task-table task-<?= $subtask['color_id'] ?>">
- <?= $this->a('#'.$subtask['task_id'], 'task', 'show', array('task_id' => $subtask['task_id'])) ?>
+ <?= $this->a('#'.$subtask['task_id'], 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?>
</td>
<td>
<?= $this->a($this->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?>
@@ -21,7 +21,7 @@
<?= $this->e($subtask['status_name']) ?>
</td>
<td>
- <?= $this->a($this->e($subtask['title']), 'task', 'show', array('task_id' => $subtask['task_id'])) ?>
+ <?= $this->a($this->e($subtask['title']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?>
</td>
</tr>
<?php endforeach ?>
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
index 57f1714f..a3d78a9d 100644
--- a/app/Template/app/tasks.php
+++ b/app/Template/app/tasks.php
@@ -12,13 +12,13 @@
<?php foreach ($tasks as $task): ?>
<tr>
<td class="task-table task-<?= $task['color_id'] ?>">
- <?= $this->a('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'])) ?>
+ <?= $this->a('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</td>
<td>
<?= $this->a($this->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
</td>
<td>
- <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'])) ?>
+ <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</td>
<td>
<?= dt('%B %e, %Y', $task['date_due']) ?>
diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php
index e99fe234..36259820 100644
--- a/app/Template/board/filters.php
+++ b/app/Template/board/filters.php
@@ -23,11 +23,11 @@
<i class="fa fa-dashboard fa-fw"></i>
<?= $this->a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
</li>
+ <?php if ($this->acl->isManagerActionAllowed($project['id'])): ?>
<li>
<i class="fa fa-line-chart fa-fw"></i>
<?= $this->a(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
</li>
- <?php if ($this->acl->isManagerActionAllowed($project['id'])): ?>
<li><i class="fa fa-cog fa-fw"></i>
<?= $this->a(t('Configure'), 'project', 'show', array('project_id' => $project['id'])) ?>
<?php endif ?>
--
cgit v1.2.3