mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-18 20:49:19 +00:00
cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification
This commit is contained in:
@@ -25,7 +25,7 @@ erpnext.ActivityFeed = Class.extend({
|
||||
init: function(row, data) {
|
||||
this.scrub_data(data);
|
||||
this.add_date_separator(row, data);
|
||||
$(row).append(sprintf('<div style="margin: 0px">\
|
||||
$(row).append(repl('<div style="margin: 0px">\
|
||||
<span class="avatar avatar-small"><img src="%(imgsrc)s" /></span> \
|
||||
<span %(onclick)s class="label %(add_class)s">%(feed_type)s</span>\
|
||||
%(link)s %(subject)s <span class="user-info">%(by)s</span></div>', data));
|
||||
@@ -53,6 +53,8 @@ erpnext.ActivityFeed = Class.extend({
|
||||
// link
|
||||
if(data.doc_name && data.feed_type!='Login') {
|
||||
data.link = repl('<a href="#!Form/%(doc_type)s/%(doc_name)s">%(doc_name)s</a>', data)
|
||||
} else {
|
||||
data.link = "";
|
||||
}
|
||||
},
|
||||
add_date_separator: function(row, data) {
|
||||
|
||||
Reference in New Issue
Block a user