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

[fix] Unlimited refresh in user form (#4457)

Browse source
This commit is contained in:
Faris Ansari 2017-11-09 17:44:26 +05:30 • committed by GitHub
parent d1db1ec5ab
commit 20dd8de0c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,8 +38,9 @@ frappe.ui.form.on('User', {
},
onload: function(frm) {
frm.can_edit_roles = has_common(frappe.user_roles, ["Administrator", "System Manager"]);
if(has_common(frappe.user_roles, ["Administrator", "System Manager"]) && !frm.doc.__islocal) {
if(frm.can_edit_roles && !frm.is_new()) {
if(!frm.roles_editor) {
var role_area = $('<div style="min-height: 300px">')
.appendTo(frm.fields_dict.roles_html.wrapper);
@ -55,8 +56,9 @@ frappe.ui.form.on('User', {
},
refresh: function(frm) {
var doc = frm.doc;
if(!frm.doc.islocal && !frm.roles_editor) {
if(!frm.is_new() && !frm.roles_editor && frm.can_edit_roles) {
frm.reload_doc();
return;
}
if(doc.name===frappe.session.user && !doc.__unsaved
&& frappe.all_timezones
@ -68,7 +70,7 @@ frappe.ui.form.on('User', {
frm.toggle_display(['sb1', 'sb3', 'modules_access'], false);
if(!doc.__islocal){
if(!frm.is_new()) {
frm.add_custom_button(__("Set Desktop Icons"), function() {
frappe.route_options = {
"user": doc.name
@ -112,8 +114,8 @@ frappe.ui.form.on('User', {
frm.trigger('enabled');
if (frm.roles_editor) {
frm.roles_editor.disabled = frm.doc.role_profile_name ? 1 : 0;
if (frm.roles_editor && frm.can_edit_roles) {
frm.roles_editor.disable = frm.doc.role_profile_name ? 1 : 0;
frm.roles_editor.show();
}
@ -156,13 +158,13 @@ frappe.ui.form.on('User', {
},
enabled: function(frm) {
var doc = frm.doc;
if(!doc.__islocal && has_common(frappe.user_roles, ["Administrator", "System Manager"])) {
if(!frm.is_new() && has_common(frappe.user_roles, ["Administrator", "System Manager"])) {
frm.toggle_display(['sb1', 'sb3', 'modules_access'], doc.enabled);
frm.set_df_property('enabled', 'read_only', 0);
}
if(frappe.session.user!=="Administrator") {
frm.toggle_enable('email', doc.__islocal);
frm.toggle_enable('email', frm.is_new());
}
},
create_user_email:function(frm) {