Browse Source

tidy up adding user to list a little bit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
pull/1701/head
Arthur Schiwon 9 years ago
parent
commit
e378cadb56
No known key found for this signature in database GPG Key ID: 7424F1874854DF23
  1. 21
      settings/js/users/users.js

21
settings/js/users/users.js

@ -48,10 +48,8 @@ var UserList = {
* 'email': 'username@example.org' * 'email': 'username@example.org'
* 'isRestoreDisabled':false * 'isRestoreDisabled':false
* } * }
* @param sort
* @returns table row created for this user
*/ */
add: function (user, sort) {
add: function (user) {
if (this.currentGid && this.currentGid !== '_everyone' && _.indexOf(user.groups, this.currentGid) < 0) { if (this.currentGid && this.currentGid !== '_everyone' && _.indexOf(user.groups, this.currentGid) < 0) {
return; return;
} }
@ -170,20 +168,12 @@ var UserList = {
UserList.checkUsersToLoad(); UserList.checkUsersToLoad();
} }
/**
* sort list
*/
if (sort) {
UserList.doSort();
}
$quotaSelect.on('change', UserList.onQuotaSelect); $quotaSelect.on('change', UserList.onQuotaSelect);
// defer init so the user first sees the list appear more quickly // defer init so the user first sees the list appear more quickly
window.setTimeout(function(){ window.setTimeout(function(){
$quotaSelect.singleSelect(); $quotaSelect.singleSelect();
}, 0); }, 0);
return $tr;
}, },
// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288 // From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
alphanum: function(a, b) { alphanum: function(a, b) {
@ -389,8 +379,6 @@ var UserList = {
OC.generateUrl('/settings/users/users'), OC.generateUrl('/settings/users/users'),
{ offset: UserList.offset, limit: limit, gid: gid, pattern: pattern }, { offset: UserList.offset, limit: limit, gid: gid, pattern: pattern },
function (result) { function (result) {
var loadedUsers = 0;
var trs = [];
//The offset does not mirror the amount of users available, //The offset does not mirror the amount of users available,
//because it is backend-dependent. For correct retrieval, //because it is backend-dependent. For correct retrieval,
//always the limit(requested amount of users) needs to be added. //always the limit(requested amount of users) needs to be added.
@ -398,9 +386,7 @@ var UserList = {
if(UserList.has(user.name)) { if(UserList.has(user.name)) {
return true; return true;
} }
var $tr = UserList.add(user, false);
trs.push($tr);
loadedUsers++;
UserList.add(user);
}); });
if (result.length > 0) { if (result.length > 0) {
UserList.doSort(); UserList.doSort();
@ -867,7 +853,8 @@ $(document).ready(function () {
} }
} }
if(!UserList.has(username)) { if(!UserList.has(username)) {
UserList.add(result, true);
UserList.add(result);
UserList.doSort();
} }
$('#newusername').focus(); $('#newusername').focus();
GroupList.incEveryoneCount(); GroupList.incEveryoneCount();

Loading…
Cancel
Save