From 45c95d74fc2115fe4cc7214553c0927d3ce9df8d Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Fri, 2 Jan 2015 21:11:19 -0500
Subject: Various fixes and improvements

---
 app/Template/comment/show.php    | 2 +-
 app/Template/project/sidebar.php | 2 +-
 app/Template/project/users.php   | 6 +++++-
 app/Template/subtask/remove.php  | 2 +-
 app/Template/subtask/show.php    | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index 2cf9708b..23389c06 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -39,7 +39,7 @@
                         'controller' => 'task',
                         'action' => 'show',
                         'params' => array(
-                            'project_id' => $project['id']
+                            'project_id' => $task['project_id']
                         )
                     )
                 ) ?>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 991a1c73..f28f6b0d 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -24,7 +24,7 @@
         <li>
             <?= $this->a(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
         </li>
-        <?php if ($project['is_private'] == 0): ?>
+        <?php if ($this->userSession->isAdmin() || $project['is_private'] == 0): ?>
         <li>
             <?= $this->a(t('User management'), 'project', 'users', array('project_id' => $project['id'])) ?>
         </li>
diff --git a/app/Template/project/users.php b/app/Template/project/users.php
index 5dc4a7e5..f223b8fa 100644
--- a/app/Template/project/users.php
+++ b/app/Template/project/users.php
@@ -13,12 +13,15 @@
             <tr>
                 <th><?= t('User') ?></th>
                 <th><?= t('Role for this project') ?></th>
-                <th><?= t('Actions') ?></th>
+                <?php if ($project['is_private'] == 0): ?>
+                    <th><?= t('Actions') ?></th>
+                <?php endif ?>
             </tr>
             <?php foreach ($users['allowed'] as $user_id => $username): ?>
             <tr>
                 <td><?= $this->e($username) ?></td>
                 <td><?= isset($users['managers'][$user_id]) ? t('Project manager') : t('Project member') ?></td>
+                <?php if ($project['is_private'] == 0): ?>
                 <td>
                     <ul>
                         <li><?= $this->a(t('Revoke'), 'project', 'revoke', array('project_id' => $project['id'], 'user_id' => $user_id), true) ?></li>
@@ -31,6 +34,7 @@
                         </li>
                     </ul>
                 </td>
+                <?php endif ?>
             </tr>
             <?php endforeach ?>
         </table>
diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php
index af193c59..c623791d 100644
--- a/app/Template/subtask/remove.php
+++ b/app/Template/subtask/remove.php
@@ -10,7 +10,7 @@
     <p><strong><?= $this->e($subtask['title']) ?></strong></p>
 
     <div class="form-actions">
-        <?= $this->a(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
+        <?= $this->a(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
     </div>
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php
index c0f61f0e..265883b7 100644
--- a/app/Template/subtask/show.php
+++ b/app/Template/subtask/show.php
@@ -44,10 +44,10 @@
                 <td>
                     <ul>
                         <li>
-                            <?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
+                            <?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
                         </li>
                         <li>
-                            <?= $this->a(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
+                            <?= $this->a(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
                         </li>
                     </ul>
                 </td>
-- 
cgit v1.2.3