Various fixes and improvements

2 files changed, 6 insertions, 2 deletions

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>