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

Merge pull request #8396 from surajshetty3416/fix-timeline

Browse source 
fix: Improper "bold text" in timeline
This commit is contained in:
mergify[bot] 2019-09-11 05:21:53 +00:00 • committed by GitHub
commit 7267d4eaff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -562,33 +562,32 @@ 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);
if(df && !df.hidden) {
var field_display_status = frappe.perm.get_field_display_status(df, null,
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) {
const 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(),
@ -599,9 +598,8 @@ 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()])));
if (parts.length) {
out.push(me.get_version_comment(version, __('changed value of {0}', [parts.join(', ')])));
}
}