From 161cf87cc052af31557a058740c226631702cb79 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 14 Dec 2012 13:13:02 +0530 Subject: [PATCH 1/2] in mousetrap - do not save if cur_frm.save_disabled is set --- public/js/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/startup.js b/public/js/startup.js index c90aedd0d30..a5ed4c4416b 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -168,7 +168,7 @@ erpnext.setup_mousetrap = function() { }); Mousetrap.bind(["command+s", "ctrl+s"], function() { - if(cur_frm) + if(cur_frm && !cur_frm.save_disabled) cur_frm.save(); else if(wn.container.page.save_action) wn.container.page.save_action(); From b0f6dde7bfe9801673774a70c9a41c548623879b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 14 Dec 2012 16:23:33 +0530 Subject: [PATCH 2/2] permission control: get parent doctype doclist in get permissions --- setup/doctype/permission_control/permission_control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/permission_control/permission_control.py b/setup/doctype/permission_control/permission_control.py index 8162c39c566..cb0575d938d 100644 --- a/setup/doctype/permission_control/permission_control.py +++ b/setup/doctype/permission_control/permission_control.py @@ -51,7 +51,7 @@ class DocType: # ------------------------------------------------------------------- def get_permissions(self,doctype): import webnotes.model.doctype - doclist = webnotes.model.doctype.get(doctype) + doclist = webnotes.model.doctype.get(doctype).get_parent_doclist() ptype = [{ 'role': perm.role,