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

[fix] set Communication status as Linked or Open during insert, deduplication in timeline, get_user_room in socketio

Browse source
This commit is contained in:
Anand Doshi 2015-08-20 12:49:01 +05:30
parent c87befc876
commit 38ecee919e
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/communication/communication.py
View file

@ -27,7 +27,7 @@ class Communication(Document):
return self.parent_doc
def validate(self):
if not self.status:
if self.get("__islocal"):
if self.reference_doctype and self.reference_name:
self.status = "Linked"

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

@ -227,14 +227,22 @@ frappe.ui.form.Comments = Class.extend({
btn: btn,
callback: function(r) {
if(!r.exc) {
var comment_exists = !!$.map(me.get_comments(), function(x) {
return x.name == r.message.name? true : undefined}).length;
me.input.val("");
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 =
me.get_comments().concat([r.message]);
me.frm.get_docinfo().comments = comments.concat([r.message]);
me.refresh(true);
}
}

2
socketio.js
View file

@ -108,7 +108,7 @@ function get_doc_room(socket, doctype, docname) {
}
function get_user_room(socket, user) {
return get_site_room(socket) + ':user:' + user;
return get_site_name(socket) + ':user:' + user;
}
function get_site_room(socket) {