mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5499 from nextcloud/backport-5459-dont-reload-on-subadmin-setting-change 

[stable11] Don't try to save the setting when its not an admin
This commit is contained in:
Morris Jobke 2017-06-21 15:36:18 -05:00 committed by GitHub
parent 53ff2c30b6 04998df1ea
commit 56c345b471
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
settings/js/users/users.js
View File

@ -965,17 +965,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');
}
}
});
@ -986,10 +984,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');
}
}
});
@ -1000,10 +1002,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');
}
}
});
@ -1014,10 +1020,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');
}
}
});
@ -1028,10 +1038,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');
}
}
});