瀏覽代碼

[fixes] assignment should work witout saving documents (#3163)

* [fixes] assignment should work witout saving documents

* [minor] check if document is __local before assignement
version-14
Makarand Bauskar 8 年之前
committed by Rushabh Mehta
父節點
當前提交
3581ad8db7
共有 2 個檔案被更改,包括 3 行新增8 行删除
  1. +1
    -4
      frappe/desk/form/assign_to.py
  2. +2
    -4
      frappe/public/js/frappe/form/footer/assign_to.js

+ 1
- 4
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',\ notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\
description=args.get("description"), notify=args.get('notify')) description=args.get("description"), notify=args.get('notify'))


if not args.get("bulk_assign"):
return get(args)
else:
return {}
return get(args)


@frappe.whitelist() @frappe.whitelist()
def add_multiple(args=None): def add_multiple(args=None):


+ 2
- 4
frappe/public/js/frappe/form/footer/assign_to.js 查看文件

@@ -80,7 +80,7 @@ frappe.ui.form.AssignTo = Class.extend({
add: function() { add: function() {
var me = this; var me = this;


if(this.frm.doc.__unsaved == 1) {
if(this.frm.is_new()) {
frappe.throw(__("Please save the document before assignment")); frappe.throw(__("Please save the document before assignment"));
return; return;
} }
@@ -93,7 +93,6 @@ frappe.ui.form.AssignTo = Class.extend({
docname: me.frm.docname, docname: me.frm.docname,
callback: function(r) { callback: function(r) {
me.render(r.message); me.render(r.message);
me.frm.reload_doc();
} }
}); });
} }
@@ -108,7 +107,7 @@ frappe.ui.form.AssignTo = Class.extend({
remove: function(owner) { remove: function(owner) {
var me = this; var me = this;


if(this.frm.doc.__unsaved == 1) {
if(this.frm.is_new()) {
frappe.throw(__("Please save the document before removing assignment")); frappe.throw(__("Please save the document before removing assignment"));
return; return;
} }
@@ -122,7 +121,6 @@ frappe.ui.form.AssignTo = Class.extend({
}, },
callback:function(r,rt) { callback:function(r,rt) {
me.render(r.message); me.render(r.message);
me.frm.reload_doc();
} }
}); });
} }


Loading…
取消
儲存