From 4a30665ec352b3dd44087d5158567213182b9526 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Mon, 17 Feb 2014 21:32:48 +0530
Subject: [PATCH] Removes Delete Icon from Admin Group.
---
settings/templates/users.php | 11 +++++++++++
settings/users.php | 20 ++++++++++++++------
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e2373ddddf..eb3a93a16e 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -28,6 +28,17 @@ $_['subadmingroups'] = array_flip($items);
<li>
<a href="#"><?php p($l->t('Everyone')); ?></a>
</li>
+
+ <!-- The Admin Group -->
+ <?php foreach($_["adminGroup"] as $adminGroup): ?>
+ <li>
+ <a href="#"><?php p($l->t('Admins')); ?></a>
+ <span class="utils">
+ <span class="usercount"><?php p(count($adminGroup['useringroup'])); ?></span>
+ </span>
+ </li>
+ <?php endforeach; ?>
+
<!--List of Groups-->
<?php foreach($_["groups"] as $group): ?>
<li data-gid="<?php p($group['name']) ?>">
diff --git a/settings/users.php b/settings/users.php
index 31a54b05c0..a3faa51ea0 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -77,17 +77,25 @@ foreach($accessibleusers as $uid => $displayName) {
}
foreach( $accessiblegroups as $gid ) {
- $groups[] = array(
- 'id' => str_replace(' ','', $gid ),
- 'name' => $gid,
- 'useringroup' => OC_Group::usersInGroup($gid, '', $limit, $offset),
- 'isAdmin' => !OC_User::isAdminUser($gid),
- );
+ if (!OC_User::isAdminUser($gid)) {
+ $groups[] = array(
+ 'id' => str_replace(' ','', $gid ),
+ 'name' => $gid,
+ 'useringroup' => OC_Group::usersInGroup($gid, '', $limit, $offset)
+ );
+ } else {
+ $adminGroup[] = array(
+ 'id' => str_replace(' ','', $gid ),
+ 'name' => $gid,
+ 'useringroup' => OC_Group::usersInGroup($gid, '', $limit, $offset)
+ );
+ }
}
$tmpl = new OC_Template( "settings", "users", "user" );
$tmpl->assign( 'users', $users );
$tmpl->assign( 'groups', $groups );
+$tmpl->assign( 'adminGroup', $adminGroup );
$tmpl->assign( 'isadmin', (int) $isadmin);
$tmpl->assign( 'subadmins', $subadmins);
$tmpl->assign( 'numofgroups', count($accessiblegroups));
--
GitLab