* fix the User Permission for Page and Report * make 'make_role_for' reqdversion-14
@@ -11,16 +11,16 @@ frappe.ui.form.on('User Permission for Page and Report', { | |||
if(!frm.roles_editor) { | |||
frm.role_area = $('<div style="min-height: 300px">') | |||
.appendTo(frm.fields_dict.roles_html.wrapper); | |||
frm.roles_editor = new frappe.RoleEditor(frm.role_area); | |||
frm.roles_editor = new frappe.RoleEditor(frm.role_area, frm); | |||
} | |||
}, | |||
page: function(frm) { | |||
frm.trigger("get_roles") | |||
frm.trigger("get_roles"); | |||
}, | |||
report: function(frm){ | |||
frm.trigger("get_roles") | |||
frm.trigger("get_roles"); | |||
}, | |||
get_roles: function(frm) { | |||
@@ -30,26 +30,26 @@ frappe.ui.form.on('User Permission for Page and Report', { | |||
method:"get_custom_roles", | |||
doc: frm.doc, | |||
callback: function(r) { | |||
refresh_field('roles') | |||
frm.roles_editor.show() | |||
refresh_field('roles'); | |||
frm.roles_editor.show(); | |||
} | |||
}) | |||
}); | |||
}, | |||
update: function(frm) { | |||
if(frm.roles_editor) { | |||
frm.roles_editor.set_roles_in_table() | |||
frm.roles_editor.set_roles_in_table(); | |||
} | |||
return frappe.call({ | |||
method:"set_custom_roles", | |||
doc: frm.doc, | |||
callback: function(r) { | |||
refresh_field('roles') | |||
frm.roles_editor.show() | |||
frappe.msgprint(__("Successfully Updated")) | |||
frm.reload_doc() | |||
refresh_field('roles'); | |||
frm.roles_editor.show(); | |||
frappe.msgprint(__("Successfully Updated")); | |||
frm.reload_doc(); | |||
} | |||
}) | |||
}); | |||
} | |||
}); |
@@ -1,5 +1,6 @@ | |||
{ | |||
"allow_copy": 1, | |||
"allow_guest_to_view": 0, | |||
"allow_import": 0, | |||
"allow_rename": 0, | |||
"beta": 0, | |||
@@ -12,6 +13,7 @@ | |||
"engine": "InnoDB", | |||
"fields": [ | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -23,7 +25,7 @@ | |||
"ignore_xss_filter": 0, | |||
"in_filter": 0, | |||
"in_global_search": 0, | |||
"in_list_view": 0, | |||
"in_list_view": 1, | |||
"in_standard_filter": 0, | |||
"label": "Set Role For", | |||
"length": 0, | |||
@@ -36,12 +38,13 @@ | |||
"read_only": 0, | |||
"remember_last_selected_value": 0, | |||
"report_hide": 0, | |||
"reqd": 0, | |||
"reqd": 1, | |||
"search_index": 0, | |||
"set_only_once": 0, | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -73,6 +76,7 @@ | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -104,6 +108,7 @@ | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -133,6 +138,7 @@ | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -163,6 +169,7 @@ | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -193,6 +200,7 @@ | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -221,6 +229,7 @@ | |||
"unique": 0 | |||
}, | |||
{ | |||
"allow_bulk_edit": 0, | |||
"allow_on_submit": 0, | |||
"bold": 0, | |||
"collapsible": 0, | |||
@@ -251,17 +260,17 @@ | |||
"unique": 0 | |||
} | |||
], | |||
"has_web_view": 0, | |||
"hide_heading": 0, | |||
"hide_toolbar": 1, | |||
"idx": 0, | |||
"image_view": 0, | |||
"in_create": 0, | |||
"in_dialog": 0, | |||
"is_submittable": 0, | |||
"issingle": 1, | |||
"istable": 0, | |||
"max_attachments": 0, | |||
"modified": "2017-02-22 18:07:29.954831", | |||
"modified": "2017-12-21 04:24:24.963988", | |||
"modified_by": "Administrator", | |||
"module": "Core", | |||
"name": "User Permission for Page and Report", | |||
@@ -4,7 +4,7 @@ frappe.RoleEditor = Class.extend({ | |||
this.frm = frm; | |||
this.wrapper = wrapper; | |||
this.disable = disable; | |||
$(wrapper).html('<div class="help">' + __("Loading") + '...</div>') | |||
$(wrapper).html('<div class="help">' + __("Loading") + '...</div>'); | |||
return frappe.call({ | |||
method: 'frappe.core.doctype.user.user.get_all_roles', | |||
callback: function(r) { | |||
@@ -60,7 +60,7 @@ frappe.RoleEditor = Class.extend({ | |||
me.frm.dirty(); | |||
}); | |||
$(this.wrapper).find('.user-role a').click(function() { | |||
me.show_permissions($(this).parent().attr('data-user-role')) | |||
me.show_permissions($(this).parent().attr('data-user-role')); | |||
return false; | |||
}); | |||
}, | |||
@@ -126,13 +126,13 @@ frappe.RoleEditor = Class.extend({ | |||
return { | |||
checked_roles: checked_roles, | |||
unchecked_roles: unchecked_roles | |||
} | |||
}; | |||
}, | |||
show_permissions: function(role) { | |||
// show permissions for a role | |||
var me = this; | |||
if(!this.perm_dialog) | |||
this.make_perm_dialog() | |||
this.make_perm_dialog(); | |||
$(this.perm_dialog.body).empty(); | |||
return frappe.call({ | |||
method: 'frappe.core.doctype.user.user.get_perm_info', | |||
@@ -191,7 +191,7 @@ frappe.RoleEditor = Class.extend({ | |||
// <td>%(print)s</td>\ | |||
// <td>%(email)s</td>' | |||
+ '<td>%(set_user_permissions)s</td>\ | |||
</tr>', perm)) | |||
</tr>', perm)); | |||
} | |||
me.perm_dialog.show(); | |||