From 8766b3286b479157cb7d6690209ff506fb01974a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 1 Aug 2012 18:03:08 +0200
Subject: [PATCH] fix a subadmin UI bug
---
settings/js/users.js | 10 ++++++++++
settings/templates/users.php | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/settings/js/users.js b/settings/js/users.js
index 7f3b027b4d..8fb587778b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -304,9 +304,13 @@ $(document).ready(function(){
tr.attr('data-uid',username);
tr.find('td.name').text(username);
var select=$('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+ var subadminselect=$('<select multiple="multiple" class="subadminsselect" data-placehoder="Groups" title="' + t('files', 'SubAdmin') + '">');
select.data('username',username);
select.data('userGroups',groups);
+ subadminselect.data('username',username);
+ subadminselect.data('userGroups',groups);
tr.find('td.groups').empty();
+ tr.find('td.subadmins').empty();
var allGroups=$('#content table').data('groups').split(', ');
for(var i=0;i<groups.length;i++){
if(allGroups.indexOf(groups[i])==-1){
@@ -315,12 +319,18 @@ $(document).ready(function(){
}
$.each(allGroups,function(i,group){
select.append($('<option value="'+group+'">'+group+'</option>'));
+ if(group != 'admin'){
+ subadminselect.append($('<option value="'+group+'">'+group+'</option>'));
+ }
});
tr.find('td.groups').append(select);
+ tr.find('td.subadmins').append(subadminselect);
if(tr.find('td.remove img').length==0){
tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
}
applyMultiplySelect(select);
+ applyMultiplySelect(subadminselect);
+
$('#content table tbody').last().append(tr);
tr.find('select.quota-user option').attr('selected',null);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 3e1eb9a0bb..9b64696547 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -109,7 +109,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
class="subadminsselect"
data-username="<?php echo $user['name'] ;?>"
data-subadmin="<?php echo $user['subadmin'] ;?>"
- data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin for ...')?>"
+ data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin')?>"
multiple="multiple">
<?php foreach($_["subadmingroups"] as $group): ?>
<option value="<?php echo $group;?>">
--
GitLab