Skip to content

Commit

Permalink
fix: list view formatting logic (backport #22646) (#22848)
Browse files Browse the repository at this point in the history
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
  • Loading branch information
mergify[bot] and barredterra committed Oct 30, 2023
1 parent 0f03ddd commit 91b87da
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions frappe/public/js/frappe/list/list_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -827,15 +827,18 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
frappe.model.is_numeric_field(df) ? "text-right" : "",
].join(" ");

const html_map = {
Subject: this.get_subject_html(doc),
Field: field_html(),
};
let column_html = html_map[col.type];

// listview_setting formatter
if (this.settings.formatters && this.settings.formatters[fieldname]) {
let column_html;
if (
this.settings.formatters &&
this.settings.formatters[fieldname] &&
col.type !== "Subject"
) {
column_html = this.settings.formatters[fieldname](value, df, doc);
} else {
column_html = {
Subject: this.get_subject_html(doc),
Field: field_html(),
}[col.type];
}

return `
Expand Down

0 comments on commit 91b87da

Please sign in to comment.