vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fixes] re-assign doc

Browse source
This commit is contained in:
Saurabh 2015-10-30 16:48:03 +05:30
parent 97bcc051dc
commit 7184cd26a2
3 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
frappe/desk/form/assign_to.py
View file

@ -45,23 +45,23 @@ def add(args=None):
todo_doc = []
for docname in get_docname_list(args):
if not_assigned(args['doctype'], docname):
d = frappe.get_doc({
"doctype":"ToDo",
"owner": args['assign_to'],
"reference_type": args['doctype'],
"reference_name": docname,
"description": args.get('description'),
"priority": args.get("priority", "Medium"),
"status": "Open",
"date": args.get('date', nowdate()),
"assigned_by": args.get('assigned_by', frappe.session.user),
}).insert(ignore_permissions=True)
todo_doc.append(d)
# set assigned_to if field exists
if frappe.get_meta(args['doctype']).get_field("assigned_to"):
frappe.db.set_value(args['doctype'], docname, "assigned_to", args['assign_to'])
remove_from_todo_if_already_assign(args['doctype'], docname)
d = frappe.get_doc({
"doctype":"ToDo",
"owner": args['assign_to'],
"reference_type": args['doctype'],
"reference_name": docname,
"description": args.get('description'),
"priority": args.get("priority", "Medium"),
"status": "Open",
"date": args.get('date', nowdate()),
"assigned_by": args.get('assigned_by', frappe.session.user),
}).insert(ignore_permissions=True)
todo_doc.append(d)
# set assigned_to if field exists
if frappe.get_meta(args['doctype']).get_field("assigned_to"):
frappe.db.set_value(args['doctype'], docname, "assigned_to", args['assign_to'])
# notify
if not args.get("no_notification"):
@ -92,13 +92,11 @@ def get_docname_list(args=None):
return docname_list
def not_assigned(doctype, docname):
def remove_from_todo_if_already_assign(doctype, docname):
owner = frappe.db.get_value("ToDo", {"reference_type": doctype, "reference_name": docname, "status":"Open"}, "owner")
if owner:
frappe.msgprint(_("{0} is already assigned to {1}".format(docname, owner)))
return False
return True
remove(doctype, docname, owner)
@frappe.whitelist()
def remove(doctype, name, assign_to):
"""remove from todo"""

4
frappe/public/js/frappe/list/doclistview.js
View file

@ -422,7 +422,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}, true);
}
//bulk assignment
me.page.add_menu_item(__("Assign To"), function(){
docname = [];
@ -448,7 +448,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
else{
frappe.msgprint(__("Select records for assignment"))
}
})
}, true)
},
init_star: function() {

11
frappe/public/js/frappe/model/sync.js
View file

@ -54,11 +54,14 @@ $.extend(frappe.model, {
if(r.docs) {
var doc = r.docs[0];
} else {
var doc = cur_frm.doc;
if(cur_frm)
var doc = cur_frm.doc;
}
if(doc) {
if(!frappe.model.docinfo[doc.doctype])
frappe.model.docinfo[doc.doctype] = {};
frappe.model.docinfo[doc.doctype][doc.name] = r.docinfo;
}
if(!frappe.model.docinfo[doc.doctype])
frappe.model.docinfo[doc.doctype] = {};
frappe.model.docinfo[doc.doctype][doc.name] = r.docinfo;
}
return r.docs;