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

[minor] fix, ignore admin an guest for mention and highlight in comment

Browse source
This commit is contained in:
Rushabh Mehta 2015-12-24 11:38:14 +05:30
parent 600309cb1c
commit fbbd9c7951
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,11 @@ frappe.ui.form.Comments = Class.extend({
c.comment_html = c.comment;
c.comment_html = frappe.utils.strip_whitespace(c.comment_html);
}
// bold @mentions
if(c.comment_type==="Comment") {
c.comment_html = c.comment_html.replace(/(^|\W)(@\w+)/g, "$1<b>$2</b>");
}
}
},
set_icon_and_color: function(c) {
@ -335,8 +340,10 @@ frappe.ui.form.Comments = Class.extend({
var username_user_map = {};
for (var name in frappe.boot.user_info) {
var _user = frappe.boot.user_info[name];
username_user_map[_user.username] = _user;
if(name !== "Administrator" && name !== "Guest") {
var _user = frappe.boot.user_info[name];
username_user_map[_user.username] = _user;
}
}
this.mention_input = this.wrapper.find(".mention-input");