From 3581ad8db70a6bb03f7dae12e827b0cf13d9480e Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 27 Apr 2017 15:52:18 +0530 Subject: [PATCH] [fixes] assignment should work witout saving documents (#3163) * [fixes] assignment should work witout saving documents * [minor] check if document is __local before assignement --- frappe/desk/form/assign_to.py | 5 +---- frappe/public/js/frappe/form/footer/assign_to.js | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py index c6746831be..8280f6c162 100644 --- a/frappe/desk/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -66,10 +66,7 @@ def add(args=None): notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\ description=args.get("description"), notify=args.get('notify')) - if not args.get("bulk_assign"): - return get(args) - else: - return {} + return get(args) @frappe.whitelist() def add_multiple(args=None): diff --git a/frappe/public/js/frappe/form/footer/assign_to.js b/frappe/public/js/frappe/form/footer/assign_to.js index 11a7f4df98..05259e541f 100644 --- a/frappe/public/js/frappe/form/footer/assign_to.js +++ b/frappe/public/js/frappe/form/footer/assign_to.js @@ -80,7 +80,7 @@ frappe.ui.form.AssignTo = Class.extend({ add: function() { var me = this; - if(this.frm.doc.__unsaved == 1) { + if(this.frm.is_new()) { frappe.throw(__("Please save the document before assignment")); return; } @@ -93,7 +93,6 @@ frappe.ui.form.AssignTo = Class.extend({ docname: me.frm.docname, callback: function(r) { me.render(r.message); - me.frm.reload_doc(); } }); } @@ -108,7 +107,7 @@ frappe.ui.form.AssignTo = Class.extend({ remove: function(owner) { var me = this; - if(this.frm.doc.__unsaved == 1) { + if(this.frm.is_new()) { frappe.throw(__("Please save the document before removing assignment")); return; } @@ -122,7 +121,6 @@ frappe.ui.form.AssignTo = Class.extend({ }, callback:function(r,rt) { me.render(r.message); - me.frm.reload_doc(); } }); }