[Pkg-owncloud-commits] [owncloud] 105/122: fix broken group presentation in selected groups list

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 795a48d45c9cb1e568c27b43b837fdc7314ac1dc
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed May 6 15:25:51 2015 +0200

    fix broken group presentation in selected groups list
---
 apps/user_ldap/js/wizard/wizardTabAbstractFilter.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
index 702c30a..1692019 100644
--- a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
@@ -158,9 +158,12 @@ 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');
@@ -224,10 +227,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();
 				}
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git