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

fix: add comment in communication

Browse source
This commit is contained in:
Rushabh Mehta 2019-02-18 16:37:51 +05:30
parent d0b9d1f026
commit 2130dd69de
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/desk/form/utils.py
View file

@ -64,7 +64,8 @@ def add_comment(reference_doctype, reference_name, content, comment_email):
reference_doctype = reference_doctype,
reference_name = reference_name,
content = clean_email_html(content),
comment_email = comment_email
comment_email = comment_email,
comment_type = 'Comment'
)).insert(ignore_permissions = True)
return doc.as_dict()

20
frappe/public/js/frappe/form/footer/timeline.js
View file

@ -654,22 +654,7 @@ frappe.ui.form.Timeline = class Timeline {
if(!r.exc) {
me.comment_area.set_value('');
frappe.utils.play_sound("click");
var comment = r.message;
var comments = me.get_comments();
var comment_exists = false;
for (var i=0, l=comments.length; i<l; i++) {
if (comments[i].name==comment.name) {
comment_exists = true;
break;
}
}
if (comment_exists) {
return;
}
me.frm.get_docinfo().comments = comments.concat([r.message]);
me.refresh(true);
frappe.timeline.new_communication(r.message);
}
}
});
@ -771,6 +756,9 @@ frappe.ui.form.Timeline = class Timeline {
$.extend(frappe.timeline, {
new_communication: function(communication) {
if (!communication.communication_type) {
communication.communication_type = 'Comment';
}
var docinfo = frappe.model.get_docinfo(communication.reference_doctype, communication.reference_name);
if (docinfo && docinfo.communications) {
var communications = docinfo.communications;