From 9ae715de756fc80d45676532298900e746f11b0d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Jun 2017 12:55:00 +0200
Subject: [PATCH 1/2] Don't try to save the setting when its not an admin

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 settings/js/users/users.js | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index dccbcc0ce1e..df574bbc949 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -1083,10 +1083,14 @@ $(document).ready(function () {
 	$('#CheckboxLastLogin').click(function() {
 		if ($('#CheckboxLastLogin').is(':checked')) {
 			$("#userlist .lastLogin").show();
-			OCP.AppConfig.setValue('core', 'umgmt_show_last_login', 'true');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_last_login', 'true');
+			}
 		} else {
 			$("#userlist .lastLogin").hide();
-			OCP.AppConfig.setValue('core', 'umgmt_show_last_login', 'false');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_last_login', 'false');
+			}
 		}
 	});
 
@@ -1097,10 +1101,14 @@ $(document).ready(function () {
 	$('#CheckboxEmailAddress').click(function() {
 		if ($('#CheckboxEmailAddress').is(':checked')) {
 			$("#userlist .mailAddress").show();
-			OCP.AppConfig.setValue('core', 'umgmt_show_email', 'true');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_email', 'true');
+			}
 		} else {
 			$("#userlist .mailAddress").hide();
-			OCP.AppConfig.setValue('core', 'umgmt_show_email', 'false');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_email', 'false');
+			}
 		}
 	});
 
@@ -1111,10 +1119,14 @@ $(document).ready(function () {
 	$('#CheckboxUserBackend').click(function() {
 		if ($('#CheckboxUserBackend').is(':checked')) {
 			$("#userlist .userBackend").show();
-			OCP.AppConfig.setValue('core', 'umgmt_show_backend', 'true');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_backend', 'true');
+			}
 		} else {
 			$("#userlist .userBackend").hide();
-			OCP.AppConfig.setValue('core', 'umgmt_show_backend', 'false');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_backend', 'false');
+			}
 		}
 	});
 
@@ -1125,10 +1137,14 @@ $(document).ready(function () {
 	$('#CheckboxMailOnUserCreate').click(function() {
 		if ($('#CheckboxMailOnUserCreate').is(':checked')) {
 			$("#newemail").show();
-			OCP.AppConfig.setValue('core', 'umgmt_send_email', 'true');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_send_email', 'true');
+			}
 		} else {
 			$("#newemail").hide();
-			OCP.AppConfig.setValue('core', 'umgmt_send_email', 'false');
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_send_email', 'false');
+			}
 		}
 	});
 

From 8600ba725a4b971c453f8400a268d700c20c7569 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 20 Jun 2017 10:35:22 +0200
Subject: [PATCH 2/2] Also allow group admins to toogle the storage location

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 settings/js/users/users.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index df574bbc949..e608efb491a 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -1062,17 +1062,15 @@ $(document).ready(function () {
 	// Option to display/hide the "Storage location" column
 	$('#CheckboxStorageLocation').click(function() {
 		if ($('#CheckboxStorageLocation').is(':checked')) {
-			OCP.AppConfig.setValue('core', 'umgmt_show_storage_location', 'true', {
-				success: function () {
-					$("#userlist .storageLocation").show();
-				}
-			});
+			$("#userlist .storageLocation").show();
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_storage_location', 'true');
+			}
 		} else {
-			OCP.AppConfig.setValue('core', 'umgmt_show_storage_location', 'false', {
-				success: function () {
-					$("#userlist .storageLocation").hide();
-				}
-			});
+			$("#userlist .storageLocation").hide();
+			if (OC.isUserAdmin()) {
+				OCP.AppConfig.setValue('core', 'umgmt_show_storage_location', 'false');
+			}
 		}
 	});