message reply
This commit is contained in:
parent
ef29e55469
commit
1a5c9c5926
@ -38,6 +38,7 @@ wn.pages.messages.onload = function(wrapper) {
|
|||||||
wn.pages.messages.onshow = function(wrapper) {
|
wn.pages.messages.onshow = function(wrapper) {
|
||||||
erpnext.messages.show();
|
erpnext.messages.show();
|
||||||
setTimeout(erpnext.messages.refresh, 5000);
|
setTimeout(erpnext.messages.refresh, 5000);
|
||||||
|
$('#message-post-text').focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
erpnext.messages = {
|
erpnext.messages = {
|
||||||
@ -83,19 +84,26 @@ erpnext.messages = {
|
|||||||
data.creation = dateutil.comment_when(data.creation);
|
data.creation = dateutil.comment_when(data.creation);
|
||||||
data.comment_by_fullname = wn.boot.user_fullnames[data.owner];
|
data.comment_by_fullname = wn.boot.user_fullnames[data.owner];
|
||||||
|
|
||||||
|
data.reply_html = '';
|
||||||
if(data.owner==user) {
|
if(data.owner==user) {
|
||||||
data.cls = 'message-self';
|
data.cls = 'message-self';
|
||||||
data.comment_by_fullname = 'You';
|
data.comment_by_fullname = 'You';
|
||||||
data.delete_html = repl('<a class="close" onclick="erpnext.messages.delete(this)"\
|
data.delete_html = repl('<a class="close" \
|
||||||
|
onclick="erpnext.messages.delete(this)"\
|
||||||
data-name="%(name)s">×</a>', data);
|
data-name="%(name)s">×</a>', data);
|
||||||
} else {
|
} else {
|
||||||
data.cls = 'message-other';
|
data.cls = 'message-other';
|
||||||
data.delete_html = '';
|
data.delete_html = '';
|
||||||
|
if(erpnext.messages.contact==user) {
|
||||||
|
data.reply_html = repl('<a href="#!messages/%(owner)s">\
|
||||||
|
<i class="icon-share-alt"></i> Reply</a>', data)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wrapper.innerHTML = repl('<div class="message %(cls)s">%(delete_html)s\
|
wrapper.innerHTML = repl('<div class="message %(cls)s">%(delete_html)s\
|
||||||
<b>%(comment)s</b>\
|
<b>%(comment)s</b>\
|
||||||
<div class="help">by %(comment_by_fullname)s, %(creation)s</div></div>\
|
<div class="help">by %(comment_by_fullname)s, %(creation)s</div>\
|
||||||
|
%(reply_html)s</div>\
|
||||||
<div style="clear: both;"></div>', data);
|
<div style="clear: both;"></div>', data);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user