Merge pull request #9628 from edozzo/master
Userlist: async load doesnt fill checked group/subadmin array
This commit is contained in:
commit
d22904612b
|
@ -365,8 +365,13 @@ var UserList = {
|
||||||
var user = UserList.getUID($element);
|
var user = UserList.getUID($element);
|
||||||
|
|
||||||
if ($element.data('user-groups')) {
|
if ($element.data('user-groups')) {
|
||||||
|
if (typeof $element.data('user-groups') === 'string') {
|
||||||
|
checked = $element.data('user-groups').split(", ");
|
||||||
|
}
|
||||||
|
else {
|
||||||
checked = $element.data('user-groups');
|
checked = $element.data('user-groups');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var checkHandler = null;
|
var checkHandler = null;
|
||||||
if(user) { // Only if in a user row, and not the #newusergroups select
|
if(user) { // Only if in a user row, and not the #newusergroups select
|
||||||
checkHandler = function (group) {
|
checkHandler = function (group) {
|
||||||
|
@ -445,8 +450,13 @@ var UserList = {
|
||||||
var user = UserList.getUID($element);
|
var user = UserList.getUID($element);
|
||||||
|
|
||||||
if ($element.data('subadmin')) {
|
if ($element.data('subadmin')) {
|
||||||
|
if (typeof $element.data('subadmin') === 'string') {
|
||||||
|
checked = $element.data('subadmin').split(", ");
|
||||||
|
}
|
||||||
|
else {
|
||||||
checked = $element.data('subadmin');
|
checked = $element.data('subadmin');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var checkHandler = function (group) {
|
var checkHandler = function (group) {
|
||||||
if (group === 'admin') {
|
if (group === 'admin') {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue