From ab1370277036b337040ce180614f967295ad287a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 28 Nov 2012 17:57:31 +0100
Subject: make some checks server-side

---
 settings/js/users.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
index 517984f9247..af83e0321a5 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -165,9 +165,6 @@ var UserList={
 			}
 			if(user){
 				var checkHandeler=function(group){
-					if(user==OC.currentUser && group=='admin'){
-						return false;
-					}
 					if(!isadmin && checked.length == 1 && checked[0] == group){
 						return false;
 					}
-- 
cgit v1.2.3


From a5774229a13ef307dabe3142d1a85f12bf41b391 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 28 Nov 2012 18:40:00 +0100
Subject: fix group and subadmin managing for 'ajax-loaded' users

---
 settings/js/users.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
index af83e0321a5..7c022e52937 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -71,15 +71,10 @@ var UserList={
 		var tr = $('tbody tr').first().clone();
 		tr.attr('data-uid', username);
 		tr.find('td.name').text(username);
-		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-		groupsSelect.data('username', username);
-		groupsSelect.data('userGroups', groups);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" data-username="' + username + '" data-user-groups="' + groups + '" title="Groups">');
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
-			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
-			subadminSelect.data('username', username);
-			subadminSelect.data('userGroups', groups);
-			subadminSelect.data('subadmin', subadmin);
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" data-username="' + username + '" data-user-groups="' + groups + '" data-subadmin="' + subadmin + '" title="' + t('files', 'Group Admin') + '">');
 			tr.find('td.subadmins').empty();
 		}
 		var allGroups = String($('#content table').attr('data-groups')).split(', ');
-- 
cgit v1.2.3


From 4c83a4c918f94413bd1a1dcbc64305e3fd25e291 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 28 Nov 2012 18:40:58 +0100
Subject: add a client side check

---
 settings/js/users.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
index 7c022e52937..a278b417219 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -160,6 +160,9 @@ var UserList={
 			}
 			if(user){
 				var checkHandeler=function(group){
+					if(user==OC.currentUser && group=='admin'){
+						return false;
+					}
 					if(!isadmin && checked.length == 1 && checked[0] == group){
 						return false;
 					}
-- 
cgit v1.2.3


From 1d1ab2a9119361d1566f521b91b519f8bd2ba823 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 29 Nov 2012 13:37:37 +0100
Subject: Revert "fix group and subadmin managing for 'ajax-loaded' users"

This reverts commit a5774229a13ef307dabe3142d1a85f12bf41b391.
---
 settings/js/users.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
index a278b417219..517984f9247 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -71,10 +71,15 @@ var UserList={
 		var tr = $('tbody tr').first().clone();
 		tr.attr('data-uid', username);
 		tr.find('td.name').text(username);
-		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" data-username="' + username + '" data-user-groups="' + groups + '" title="Groups">');
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+		groupsSelect.data('username', username);
+		groupsSelect.data('userGroups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
-			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" data-username="' + username + '" data-user-groups="' + groups + '" data-subadmin="' + subadmin + '" title="' + t('files', 'Group Admin') + '">');
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
+			subadminSelect.data('username', username);
+			subadminSelect.data('userGroups', groups);
+			subadminSelect.data('subadmin', subadmin);
 			tr.find('td.subadmins').empty();
 		}
 		var allGroups = String($('#content table').attr('data-groups')).split(', ');
-- 
cgit v1.2.3


From e5af24d08489fa873380112f5ee081013aee58f3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 29 Nov 2012 13:56:07 +0100
Subject: use attr instead of data

---
 settings/js/users.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
index 517984f9247..f2ce69cf311 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -71,15 +71,10 @@ var UserList={
 		var tr = $('tbody tr').first().clone();
 		tr.attr('data-uid', username);
 		tr.find('td.name').text(username);
-		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-		groupsSelect.data('username', username);
-		groupsSelect.data('userGroups', groups);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups"></select>').attr('data-username', username).attr('data-user-groups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
-			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
-			subadminSelect.data('username', username);
-			subadminSelect.data('userGroups', groups);
-			subadminSelect.data('subadmin', subadmin);
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
 			tr.find('td.subadmins').empty();
 		}
 		var allGroups = String($('#content table').attr('data-groups')).split(', ');
-- 
cgit v1.2.3