upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge pull request #16122 from owncloud/fix-15866

Browse source 
Fix broken group presentation in selected groups list
This commit is contained in:
Morris Jobke 2015-05-06 17:00:31 +02:00
commit cd4b9258fc
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
View file

@ -158,15 +158,19 @@ OCA = OCA || {};
/**
* sets the selected groups
*
* @param {Array} groups
* @param {string} groups
*/
setGroups: function(groups) {
if(typeof groups === 'string') {
groups = groups.split("\n");
}
if(!this.isComplexGroupChooser) {
this.setElementValue(this.getGroupsItem().$element, groups);
this.getGroupsItem().$element.multiselect('refresh');
} else {
var $element = $(this.tabID).find('.ldapGroupListSelected');
this.equipMultiSelect($element, groups);
this.updateFilterOnType('selected');
}
},
@ -224,10 +228,10 @@ OCA = OCA || {};
$selectedGroups, $(this.tabID).find('.ldapManyGroupsSearch')
));
} else {
if(_.isUndefined || only.toLowerCase() === 'available') {
if(only.toLowerCase() === 'available') {
this.filterOnType[0].updateOptions();
}
if(_.isUndefined || only.toLowerCase() === 'selected') {
if(only.toLowerCase() === 'selected') {
this.filterOnType[1].updateOptions();
}
}
@ -357,7 +361,7 @@ OCA = OCA || {};
this._saveGroups(selected.concat($available.val()));
$available.find('option:selected').prependTo($selected);
this.updateFilterOnType();
this.updateFilterOnType('available'); // selected groups are not updated yet
},
/**
@ -370,7 +374,7 @@ OCA = OCA || {};
this._saveGroups(selected);
$selected.find('option:selected').appendTo($available);
this.updateFilterOnType();
this.updateFilterOnType('available'); // selected groups are not updated yet
}
});