Add new role Project Administrator

5 files changed, 8 insertions, 12 deletions

diff --git a/app/Template/user/create_local.php b/app/Template/user/create_local.php
index aeec300f..3c8b43b0 100644
--- a/app/Template/user/create_local.php
+++ b/app/Template/user/create_local.php
@@ -39,6 +39,7 @@
 
             <?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
             <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('is_project_admin', t('Project Administrator'), 1, isset($values['is_project_admin']) && $values['is_project_admin'] == 1 ? true : false) ?>
         </div>
 
         <div class="form-actions">
diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php
index 52661585..6b3678d3 100644
--- a/app/Template/user/create_remote.php
+++ b/app/Template/user/create_remote.php
@@ -39,6 +39,7 @@
 
             <?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
             <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('is_project_admin', t('Project Administrator'), 1, isset($values['is_project_admin']) && $values['is_project_admin'] == 1 ? true : false) ?>
             <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
         </div>
 
diff --git a/app/Template/user/edit.php b/app/Template/user/edit.php
index ea7e3875..a60ee681 100644
--- a/app/Template/user/edit.php
+++ b/app/Template/user/edit.php
@@ -24,6 +24,7 @@
 
     <?php if ($this->user->isAdmin()): ?>
         <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1) ?><br/>
+        <?= $this->form->checkbox('is_project_admin', t('Project Administrator'), 1, isset($values['is_project_admin']) && $values['is_project_admin'] == 1) ?><br/>
     <?php endif ?>
 
     <div class="form-actions">
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
index edf043a6..d74aa748 100644
--- a/app/Template/user/index.php
+++ b/app/Template/user/index.php
@@ -18,9 +18,9 @@
                 <th><?= $paginator->order(t('Name'), 'name') ?></th>
                 <th><?= $paginator->order(t('Email'), 'email') ?></th>
                 <th><?= $paginator->order(t('Administrator'), 'is_admin') ?></th>
+                <th><?= $paginator->order(t('Project Administrator'), 'is_project_admin') ?></th>
                 <th><?= $paginator->order(t('Two factor authentication'), 'twofactor_activated') ?></th>
                 <th><?= $paginator->order(t('Notifications'), 'notifications_enabled') ?></th>
-                <th><?= t('External accounts') ?></th>
                 <th><?= $paginator->order(t('Account type'), 'is_ldap_user') ?></th>
             </tr>
             <?php foreach ($paginator->getCollection() as $user): ?>
@@ -41,6 +41,9 @@
                     <?= $user['is_admin'] ? t('Yes') : t('No') ?>
                 </td>
                 <td>
+                    <?= $user['is_project_admin'] ? t('Yes') : t('No') ?>
+                </td>
+                <td>
                     <?= $user['twofactor_activated'] ? t('Yes') : t('No') ?>
                 </td>
                 <td>
@@ -51,16 +54,6 @@
                     <?php endif ?>
                 </td>
                 <td>
-                    <ul class="no-bullet">
-                    <?php if ($user['google_id']): ?>
-                        <li><i class="fa fa-google fa-fw"></i><?= t('Google account linked') ?></li>
-                    <?php endif ?>
-                    <?php if ($user['github_id']): ?>
-                        <li><i class="fa fa-github fa-fw"></i><?= t('Github account linked') ?></li>
-                    <?php endif ?>
-                    </ul>
-                </td>
-                <td>
                     <?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?>
                 </td>
             </tr>
diff --git a/app/Template/user/show.php b/app/Template/user/show.php
index acb02f71..220ad87e 100644
--- a/app/Template/user/show.php
+++ b/app/Template/user/show.php
@@ -11,7 +11,7 @@
     <h2><?= t('Security') ?></h2>
 </div>
 <ul class="listing">
-    <li><?= t('Group:') ?> <strong><?= $user['is_admin'] ? t('Administrator') : t('Regular user') ?></strong></li>
+    <li><?= t('Group:') ?> <strong><?= $user['is_admin'] ? t('Administrator') : ($user['is_project_admin'] ? t('Project Administrator') : t('Regular user')) ?></strong></li>
     <li><?= t('Account type:') ?> <strong><?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?></strong></li>
     <li><?= $user['twofactor_activated'] == 1 ? t('Two factor authentication enabled') :  t('Two factor authentication disabled') ?></li>
 </ul>