From 4aa99e949224279ad64be26806e2657e66bf5adf Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sat, 27 Sep 2014 21:40:47 -0400
Subject: Hide users menu for non-admins (pull-request #284)

---
 app/Model/Acl.php             | 2 +-
 app/Templates/layout.php      | 6 +++---
 app/Templates/user_layout.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/Model/Acl.php b/app/Model/Acl.php
index f92b3021..8c57425d 100644
--- a/app/Model/Acl.php
+++ b/app/Model/Acl.php
@@ -34,7 +34,7 @@ class Acl extends Base
         'app' => array('index'),
         'board' => array('index', 'show', 'save', 'check', 'changeassignee', 'updateassignee', 'changecategory', 'updatecategory'),
         'project' => array('tasks', 'index', 'forbidden', 'search', 'export', 'show', 'activity'),
-        'user' => array('index', 'edit', 'forbidden', 'logout', 'index', 'show', 'external', 'unlinkgoogle', 'unlinkgithub', 'sessions', 'removesession', 'last', 'notifications', 'password'),
+        'user' => array('edit', 'forbidden', 'logout', 'show', 'external', 'unlinkgoogle', 'unlinkgithub', 'sessions', 'removesession', 'last', 'notifications', 'password'),
         'comment' => array('create', 'save', 'confirm', 'remove', 'update', 'edit', 'forbidden'),
         'file' => array('create', 'save', 'download', 'confirm', 'remove', 'open', 'image'),
         'subtask' => array('create', 'save', 'edit', 'update', 'confirm', 'remove'),
diff --git a/app/Templates/layout.php b/app/Templates/layout.php
index c405777f..e0158dfb 100644
--- a/app/Templates/layout.php
+++ b/app/Templates/layout.php
@@ -56,10 +56,10 @@
                     <li <?= isset($menu) && $menu === 'projects' ? 'class="active"' : '' ?>>
                         <a href="?controller=project"><?= t('Projects') ?></a>
                     </li>
-                    <li <?= isset($menu) && $menu === 'users' ? 'class="active"' : '' ?>>
-                        <a href="?controller=user"><?= t('Users') ?></a>
-                    </li>
                     <?php if (Helper\is_admin()): ?>
+                        <li <?= isset($menu) && $menu === 'users' ? 'class="active"' : '' ?>>
+                            <a href="?controller=user"><?= t('Users') ?></a>
+                        </li>
                         <li class="hide-tablet <?= isset($menu) && $menu === 'config' ? 'active' : '' ?>">
                             <a href="?controller=config"><?= t('Settings') ?></a>
                         </li>
diff --git a/app/Templates/user_layout.php b/app/Templates/user_layout.php
index 890b0c0a..7462b3f0 100644
--- a/app/Templates/user_layout.php
+++ b/app/Templates/user_layout.php
@@ -1,12 +1,12 @@
 <section id="main">
     <div class="page-header">
         <h2><?= Helper\escape($user['name'] ?: $user['username']).' (#'.$user['id'].')' ?></h2>
+        <?php if (Helper\is_admin()): ?>
         <ul>
             <li><a href="?controller=user&amp;action=index"><?= t('All users') ?></a></li>
-            <?php if (Helper\is_admin()): ?>
-                <li><a href="?controller=user&amp;action=create"><?= t('New user') ?></a></li>
-            <?php endif ?>
+            <li><a href="?controller=user&amp;action=create"><?= t('New user') ?></a></li>
         </ul>
+        <?php endif ?>
     </div>
     <section class="user-show" id="user-section">
 
-- 
cgit v1.2.3