From 42cd7396686c857386490c52eaa0a32c272a1932 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 31 Oct 2017 13:45:53 +0530 Subject: [PATCH 1/2] [fix] role editor disable --- frappe/core/doctype/user/user.js | 10 +++++++--- frappe/public/js/frappe/roles_editor.js | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js index ac443c8d69..dbe9be60c1 100644 --- a/frappe/core/doctype/user/user.js +++ b/frappe/core/doctype/user/user.js @@ -22,11 +22,11 @@ frappe.ui.form.on('User', { if(!frm.roles_editor) { var role_area = $('
') .appendTo(frm.fields_dict.roles_html.wrapper); - frm.roles_editor = new frappe.RoleEditor(role_area, frm); + frm.roles_editor = new frappe.RoleEditor(role_area, frm, frm.doc.role_profile_name ? 1 : 0); var module_area = $('
') .appendTo(frm.fields_dict.modules_html.wrapper); - frm.module_editor = new frappe.ModuleEditor(frm, module_area) + frm.module_editor = new frappe.ModuleEditor(frm, module_area); } else { frm.roles_editor.show(); } @@ -89,7 +89,11 @@ frappe.ui.form.on('User', { frm.trigger('enabled'); - frm.roles_editor && frm.roles_editor.show(); + if (frm.roles_editor) { + frm.roles_editor.disabled = frm.doc.role_profile_name ? 1 : 0; + frm.roles_editor.show(); + } + frm.module_editor && frm.module_editor.refresh(); if(frappe.session.user==doc.name) { diff --git a/frappe/public/js/frappe/roles_editor.js b/frappe/public/js/frappe/roles_editor.js index 37904dbb74..4a941a412c 100644 --- a/frappe/public/js/frappe/roles_editor.js +++ b/frappe/public/js/frappe/roles_editor.js @@ -74,6 +74,11 @@ frappe.RoleEditor = Class.extend({ .find('[data-user-role="'+user_role.role+'"] input[type="checkbox"]').get(0); if(checkbox) checkbox.checked = true; }); + + this.set_enable_disable(); + }, + set_enable_disable: function() { + $('.box').attr('disabled', this.disable ? true : false); }, set_roles_in_table: function() { var opts = this.get_roles(); From 7150c7b9974abbba908074f4dd33aefa61e33bc6 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 8 Nov 2017 12:38:34 +0600 Subject: [PATCH 2/2] bumped to version 9.2.8 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 0134829874..780966be86 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.2.7' +__version__ = '9.2.8' __title__ = "Frappe Framework" local = Local()