Bläddra i källkod

[fix] role editor disable

version-14
Rushabh Mehta 7 år sedan
förälder
incheckning
42cd739668
2 ändrade filer med 12 tillägg och 3 borttagningar
  1. +7
    -3
      frappe/core/doctype/user/user.js
  2. +5
    -0
      frappe/public/js/frappe/roles_editor.js

+ 7
- 3
frappe/core/doctype/user/user.js Visa fil

@@ -22,11 +22,11 @@ frappe.ui.form.on('User', {
if(!frm.roles_editor) {
var role_area = $('<div style="min-height: 300px">')
.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 = $('<div style="min-height: 300px">')
.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) {


+ 5
- 0
frappe/public/js/frappe/roles_editor.js Visa fil

@@ -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();


Laddar…
Avbryt
Spara