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

refactor: Rename card to is_card

Browse source
This commit is contained in:
Suraj Shetty 2020-12-07 11:15:20 +05:30
parent 8239f8d875
commit 950fc99831
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/page/user_profile/user_profile_controller.js
View file

@ -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),
};
});

6
frappe/public/js/frappe/form/footer/base_timeline.js
View file

@ -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 = $(`<div class="timeline-item">`);
if (item.icon) {
@ -74,9 +74,9 @@ class BaseTimeline {
timeline_item.append(`<div class="timeline-dot">`);
}
timeline_item.append(`<div class="timeline-content ${item.card ? 'frappe-card' : ''}">`);
timeline_item.append(`<div class="timeline-content ${item.is_card ? 'frappe-card' : ''}">`);
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(`<span> - ${comment_when(item.creation)}</span>`);
}
return timeline_item;

6
frappe/public/js/frappe/form/footer/form_timeline.js
View file

@ -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),
});