nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into production

Browse Source
This commit is contained in:
Nabin Hait
2012-12-12 12:58:22 +05:30
parent c52edd1e59 74aebf0965
commit be356b8692
15 changed files with 179 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utilities/page/messages/messages.js
View File

@@ -88,7 +88,7 @@ erpnext.Messages = Class.extend({
$('#message-title').html(contact==user ? "Everyone" :
wn.user_info(contact).fullname)
$('#avatar-image').attr("src", wn.user_info(contact).image);
$('#avatar-image').attr("src", wn.utils.get_file_link(wn.user_info(contact).image));
$("#show-everyone").toggle(contact!=user);
@@ -129,7 +129,7 @@ erpnext.Messages = Class.extend({
data.creation = dateutil.comment_when(data.creation);
data.comment_by_fullname = wn.user_info(data.owner).fullname;
data.image = wn.user_info(data.owner).image;
data.image = wn.utils.get_file_link(wn.user_info(data.owner).image);
data.mark_html = "";
data.reply_html = '';
@@ -148,7 +148,7 @@ erpnext.Messages = Class.extend({
data-name="%(name)s">&times;</a>', data);
}
if(data.owner==data.comment_docname) {
if(data.owner==data.comment_docname && data.parenttype!="Assignment") {
data.mark_html = "<div class='message-mark' title='Public'\
style='background-color: green'></div>"
}
@@ -190,7 +190,7 @@ erpnext.Messages = Class.extend({
var p = r.message[i];
if(p.name != user) {
p.fullname = wn.user_info(p.name).fullname;
p.image = wn.user_info(p.name).image;
p.image = wn.utils.get_file_link(wn.user_info(p.name).image);
p.name = p.name.replace('@', '__at__');
p.status_color = p.has_session ? "green" : "#ddd";
p.status = p.has_session ? "Online" : "Offline";

1
utilities/page/messages/messages.py
View File

@@ -72,6 +72,7 @@ def post(arg=None):
arg.update(webnotes.form_dict)
from webnotes.model.doc import Document
d = Document('Comment')
d.parenttype = arg.get("parenttype")
d.comment = arg['txt']
d.comment_docname = arg['contact']
d.comment_doctype = 'Message'