[Pkg-owncloud-commits] [owncloud] 26/59: backport of #9628

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit d3b6a6333ee6caf0b8075d8f8628c9ec240b9702
Author: DeLtAfOx <edo at ravers.it>
Date:   Tue Jul 15 07:52:04 2014 +0200

    backport of #9628
    
    Userlist: async load doesnt fill checked group/subadmin array
    
    Strinct comparsion fix
---
 settings/js/users/users.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 7d567e2..ba22890 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -365,7 +365,12 @@ var UserList = {
 		var user = UserList.getUID($element);
 
 		if ($element.data('user-groups')) {
-			checked = $element.data('user-groups');
+			if (typeof $element.data('user-groups') === 'string') {
+				checked = $element.data('user-groups').split(", ");
+			}
+			else {
+				checked = $element.data('user-groups');
+			}
 		}
 		var checkHandler = null;
 		if(user) { // Only if in a user row, and not the #newusergroups select
@@ -445,7 +450,12 @@ var UserList = {
 		var user = UserList.getUID($element);
 
 		if ($element.data('subadmin')) {
-			checked = $element.data('subadmin');
+			if (typeof $element.data('subadmin') === 'string') {
+				checked = $element.data('subadmin').split(", ");
+			}
+			else {
+				checked = $element.data('subadmin');
+			}
 		}
 		var checkHandler = function (group) {
 			if (group === 'admin') {

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