mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4447 from owncloud/fix_4351_master 

Use JSON to send/receive group data.
This commit is contained in:
Morris Jobke 2013-08-20 02:49:48 -07:00
parent 884c6b5a82 9840363488
commit de949b1caa
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings/ajax/createuser.php
View File

@ -41,7 +41,7 @@ try {
OC_JSON::success(array("data" =>
array(
"username" => $username,
"groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
"groups" => OC_Group::getUserGroups( $username ))));
} catch (Exception $exception) {
OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
}

28
settings/js/users.js
View File

@ -89,10 +89,15 @@ var UserList = {
tr.attr('data-displayName', displayname);
tr.find('td.name').text(username);
tr.find('td.displayName > span').text(displayname);
var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
.attr('data-username', username)
.attr('data-user-groups', [groups]);
tr.find('td.groups').empty();
if (tr.find('td.subadmins').length > 0) {
var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
.attr('data-username', username)
.attr('data-user-groups', [groups])
.attr('data-subadmin', [subadmin]);
tr.find('td.subadmins').empty();
}
$.each(this.availableGroups, function (i, group) {
@ -227,7 +232,7 @@ var UserList = {
var user = element.attr('data-username');
if ($(element).attr('class') === 'groupsselect') {
if (element.data('userGroups')) {
checked = String(element.data('userGroups')).split(', ');
checked = element.data('userGroups');
}
if (user) {
var checkHandeler = function (group) {
@ -244,11 +249,12 @@ var UserList = {
group: group
},
function (response) {
if(response.status === 'success') {
if(UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') {
UserList.availableGroups.push(response.data.groupname);
}
} else {
if(response.status === 'success'
&& UserList.availableGroups.indexOf(response.data.groupname) === -1
&& response.data.action === 'add') {
UserList.availableGroups.push(response.data.groupname);
}
if(response.data.message) {
OC.Notification.show(response.data.message);
}
}
@ -282,7 +288,7 @@ var UserList = {
}
if ($(element).attr('class') === 'subadminsselect') {
if (element.data('subadmin')) {
checked = String(element.data('subadmin')).split(', ');
checked = element.data('subadmin');
}
var checkHandeler = function (group) {
if (group === 'admin') {
@ -321,7 +327,7 @@ var UserList = {
$(document).ready(function () {
UserList.doSort();
UserList.availableGroups = $('#content table').attr('data-groups').split(', ');
UserList.availableGroups = $('#content table').data('groups');
$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
OC.Router.registerLoadedCallback(function () {
UserList.update();
@ -450,7 +456,7 @@ $(document).ready(function () {
t('settings', 'Error creating user'));
} else {
if (result.data.groups) {
var addedGroups = result.data.groups.split(', ');
var addedGroups = result.data.groups;
UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
}
if($('tr[data-uid="' + username + '"]').length === 0) {

6
settings/templates/users.php
View File

@ -78,7 +78,7 @@ $_['subadmingroups'] = array_flip($items);
</div>
</div>
<table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
<table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
<thead>
<tr>
<th id='headerName'><?php p($l->t('Username'))?></th>
@ -108,7 +108,7 @@ $_['subadmingroups'] = array_flip($items);
<td class="groups"><select
class="groupsselect"
data-username="<?php p($user['name']) ;?>"
data-user-groups="<?php p($user['groups']) ;?>"
data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
multiple="multiple">
<?php foreach($_["groups"] as $group): ?>
@ -120,7 +120,7 @@ $_['subadmingroups'] = array_flip($items);
<td class="subadmins"><select
class="subadminsselect"
data-username="<?php p($user['name']) ;?>"
data-subadmin="<?php p($user['subadmin']);?>"
data-subadmin="<?php p(json_encode($user['subadmin']));?>"
data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
multiple="multiple">
<?php foreach($_["subadmingroups"] as $group): ?>

15
settings/users.php
View File

@ -54,15 +54,16 @@ foreach($accessibleusers as $uid => $displayName) {
$name = $displayName;
if ( $displayName !== $uid ) {
$name = $name . ' ('.$uid.')';
}
}
$users[] = array(
"name" => $uid,
"displayName" => $displayName,
"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
'quota'=>$quota,
'isQuotaUserDefined'=>$isQuotaUserDefined,
'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($uid)));
"displayName" => $displayName,
"groups" => OC_Group::getUserGroups($uid),
'quota' => $quota,
'isQuotaUserDefined' => $isQuotaUserDefined,
'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
);
}
foreach( $accessiblegroups as $i ) {