diff --git a/frappe/desk/page/user_profile/user_profile_controller.js b/frappe/desk/page/user_profile/user_profile_controller.js index f799501873..7afbb126e3 100644 --- a/frappe/desk/page/user_profile/user_profile_controller.js +++ b/frappe/desk/page/user_profile/user_profile_controller.js @@ -392,7 +392,7 @@ class UserProfile { return { icon: icon, creation: data.creation, - card: true, + is_card: true, content: frappe.energy_points.format_history_log(data), }; }); diff --git a/frappe/public/js/frappe/form/footer/base_timeline.js b/frappe/public/js/frappe/form/footer/base_timeline.js index dbd095b7d2..2610dc40cb 100644 --- a/frappe/public/js/frappe/form/footer/base_timeline.js +++ b/frappe/public/js/frappe/form/footer/base_timeline.js @@ -59,7 +59,7 @@ class BaseTimeline { get_timeline_item(item) { // item can have content*, creation*, // timeline_badge, icon, icon_size, - // hide_timestamp, card + // hide_timestamp, is_card const timeline_item = $(`
`); if (item.icon) { @@ -74,9 +74,9 @@ class BaseTimeline { timeline_item.append(`
`); } - timeline_item.append(`
`); + timeline_item.append(`
`); timeline_item.find('.timeline-content').append(item.content); - if (!item.hide_timestamp && !item.card) { + if (!item.hide_timestamp && !item.is_card) { timeline_item.find('.timeline-content').append(` - ${comment_when(item.creation)}`); } return timeline_item; diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js index f1966a466d..2da5dd5b5b 100644 --- a/frappe/public/js/frappe/form/footer/form_timeline.js +++ b/frappe/public/js/frappe/form/footer/form_timeline.js @@ -130,7 +130,7 @@ class FormTimeline extends BaseTimeline { icon: 'mail', icon_size: 'sm', creation: communication.creation, - card: true, + is_card: true, content: this.get_communication_timeline_content(communication), }); }); @@ -151,7 +151,7 @@ class FormTimeline extends BaseTimeline { comment_timeline_contents.push({ icon: 'small-message', creation: comment.creation, - card: true, + is_card: true, content: this.get_comment_timeline_content(comment), }); }); @@ -248,7 +248,7 @@ class FormTimeline extends BaseTimeline { custom_timeline_contents.push({ icon: custom_item.icon, icon_size: 'sm', - card: custom_item.show_card, + is_card: custom_item.show_card, creation: custom_item.creation, content: custom_item.content || frappe.render_template(custom_item.template, custom_item.template_data), });