vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove hardcoded roles for editing users (#5726)

Browse source 
* Remove hardcoded roles for editing users

- Allow user edit if user has role which
has access with permlevel >= 1 to user doctype

* Fix codacy
This commit is contained in:
Suraj Shetty 2018-07-04 10:41:05 +05:30 • committed by Rushabh Mehta
parent 9a1112b8f3
commit 2bd48e3799
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frappe/core/doctype/user/user.js
View file

@ -38,7 +38,7 @@ frappe.ui.form.on('User', {
},
onload: function(frm) {
frm.can_edit_roles = has_common(frappe.user_roles, ["Administrator", "System Manager"]);
frm.can_edit_roles = has_access_to_edit_user();
if(frm.can_edit_roles && !frm.is_new()) {
if(!frm.roles_editor) {
@ -75,7 +75,7 @@ frappe.ui.form.on('User', {
frappe.frappe_toolbar.modules_select.show(doc.name);
}, null, "btn-default")
if(has_common(frappe.user_roles, ["Administrator", "System Manager"])) {
if(has_access_to_edit_user()) {
frm.add_custom_button(__("Set User Permissions"), function() {
frappe.route_options = {
@ -155,7 +155,7 @@ frappe.ui.form.on('User', {
},
enabled: function(frm) {
var doc = frm.doc;
if(!frm.is_new() && has_common(frappe.user_roles, ["Administrator", "System Manager"])) {
if(!frm.is_new() && has_access_to_edit_user()) {
frm.toggle_display(['sb1', 'sb3', 'modules_access'], doc.enabled);
frm.set_df_property('enabled', 'read_only', 0);
}
@ -192,6 +192,15 @@ frappe.ui.form.on('User', {
}
})
function has_access_to_edit_user() {
return has_common(frappe.user_roles, get_roles_for_editing_user());
}
function get_roles_for_editing_user() {
return frappe.get_meta('User').permissions
.filter(perm => perm.permlevel >= 1 && perm.write)
.map(perm => perm.role) || ['System Manager'];
}
frappe.ModuleEditor = Class.extend({
init: function(frm, wrapper) {