From 3b3b90234fdc4689804acffea1dcd3a3be66906b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 11 Sep 2019 09:35:51 +0530 Subject: [PATCH 1/2] fix: Do not bold text parts unwanted - Complete text finally gets wrapped inside bold --- frappe/public/js/frappe/form/footer/timeline.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index eb9d35398f..52bbfe7864 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -585,21 +585,21 @@ frappe.ui.form.Timeline = class Timeline { var df = frappe.meta.get_docfield(me.frm.doctype, p[0], me.frm.docname); - if(df && !df.hidden) { + if (df && !df.hidden) { var field_display_status = frappe.perm.get_field_display_status(df, null, me.frm.perm); - if(field_display_status === 'Read' || field_display_status === 'Write') { + if (field_display_status === 'Read' || field_display_status === 'Write') { parts.push(__('{0} from {1} to {2}', [ __(df.label), - (frappe.ellipsis(frappe.utils.html2text(p[1]), 40) || '""').bold(), - (frappe.ellipsis(frappe.utils.html2text(p[2]), 40) || '""').bold() + (frappe.ellipsis(frappe.utils.html2text(p[1]), 40) || '""'), + (frappe.ellipsis(frappe.utils.html2text(p[2]), 40) || '""') ])); } } } return parts.length < 3; }); - if(parts.length) { + if (parts.length) { parts = parts.map(frappe.utils.escape_html); out.push(me.get_version_comment(version, __("changed value of {0}", [parts.join(', ').bold()]))); } From c89b8fc9195a7e3aa9f0c43d56aa7a1669e93a58 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 11 Sep 2019 09:49:57 +0530 Subject: [PATCH 2/2] fix: Improper text bold in timeline.js --- .../public/js/frappe/form/footer/timeline.js | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 52bbfe7864..6459a4b30a 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -562,37 +562,36 @@ frappe.ui.form.Timeline = class Timeline { build_version_comments(docinfo, out) { var me = this; docinfo.versions.forEach(function(version) { - if(!version.data) return; + if (!version.data) return; var data = JSON.parse(version.data); // comment - if(data.comment) { + if (data.comment) { out.push(me.get_version_comment(version, data.comment, data.comment_type)); return; } // value changed in parent - if(data.changed && data.changed.length) { - var parts = []; - data.changed.every(function(p) { - if(p[0]==='docstatus') { - if(p[2]==1) { + if (data.changed && data.changed.length) { + const parts = []; + data.changed.every(function (p) { + if (p[0] === 'docstatus') { + if (p[2] == 1) { out.push(me.get_version_comment(version, __('submitted this document'))); - } else if (p[2]==2) { + } else if (p[2] == 2) { out.push(me.get_version_comment(version, __('cancelled this document'))); } } else { - - var df = frappe.meta.get_docfield(me.frm.doctype, p[0], me.frm.docname); - + p = p.map(frappe.utils.escape_html); + const df = frappe.meta.get_docfield(me.frm.doctype, p[0], me.frm.docname); if (df && !df.hidden) { - var field_display_status = frappe.perm.get_field_display_status(df, null, + const field_display_status = frappe.perm.get_field_display_status(df, null, me.frm.perm); if (field_display_status === 'Read' || field_display_status === 'Write') { parts.push(__('{0} from {1} to {2}', [ __(df.label), - (frappe.ellipsis(frappe.utils.html2text(p[1]), 40) || '""'), - (frappe.ellipsis(frappe.utils.html2text(p[2]), 40) || '""') + (frappe.ellipsis(frappe.utils.html2text(p[1]), 40) || '""').bold(), + (frappe.ellipsis(frappe.utils.html2text(p[2]), 40) || '""').bold() ])); } } @@ -600,8 +599,7 @@ frappe.ui.form.Timeline = class Timeline { return parts.length < 3; }); if (parts.length) { - parts = parts.map(frappe.utils.escape_html); - out.push(me.get_version_comment(version, __("changed value of {0}", [parts.join(', ').bold()]))); + out.push(me.get_version_comment(version, __('changed value of {0}', [parts.join(', ')]))); } }