From e09b45ed81f10defb47114ef1b2e5bf9bf336bde Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 24 Sep 2019 14:03:39 +0530
Subject: [PATCH] fix: List view formatting

---
 .../data_import_beta/data_import_beta_list.js | 19 +++++++++++++++++++
 frappe/public/js/frappe/list/list_view.js     | 15 ++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 frappe/core/doctype/data_import_beta/data_import_beta_list.js

diff --git a/frappe/core/doctype/data_import_beta/data_import_beta_list.js b/frappe/core/doctype/data_import_beta/data_import_beta_list.js
new file mode 100644
index 0000000000..b7674b432d
--- /dev/null
+++ b/frappe/core/doctype/data_import_beta/data_import_beta_list.js
@@ -0,0 +1,19 @@
+frappe.listview_settings['Data Import Beta'] = {
+	get_indicator: function(doc) {
+		var colors = {
+			"Pending": "orange",
+			"Partial Success": "orange",
+			"Success": "green",
+		}
+		return [__(doc.status), colors[doc.status], "status,=," + doc.status];
+	},
+	formatters: {
+		import_type(value) {
+			return {
+				'Insert New Records': __('Insert'),
+				'Update Existing Records': __('Update')
+			}[value];
+		}
+	},
+	hide_name_column: true
+};
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 5c4a23962b..19079e1c24 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -525,13 +525,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		const fieldname = df.fieldname;
 		const value = doc[fieldname] || '';
 
-		// listview_setting formatter
-		const formatters = this.settings.formatters;
-
 		const format = () => {
-			if (formatters && formatters[fieldname]) {
-				return formatters[fieldname](value, df, doc);
-			} else if (df.fieldtype === 'Code') {
+			if (df.fieldtype === 'Code') {
 				return value;
 			} else if (df.fieldtype === 'Percent') {
 				return `<div class="progress level" style="margin: 0px;">
@@ -547,7 +542,13 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const field_html = () => {
 			let html;
-			const _value = typeof value === 'string' ? frappe.utils.escape_html(value) : value;
+			let _value;
+			// listview_setting formatter
+			if (this.settings.formatters && this.settings.formatters[fieldname]) {
+				_value = this.settings.formatters[fieldname](value, df, doc);
+			} else {
+				_value = typeof value === 'string' ? frappe.utils.escape_html(value) : value;
+			}
 
 			if (df.fieldtype === 'Image') {
 				html = df.options ?