diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index c3aa96c404..21d593b095 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -943,8 +943,8 @@ "bold": 0, "collapsible": 0, "columns": 0, - "depends_on": "eval:cur_frm.doc.istable", - "description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)", + "depends_on": "", + "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)", "fieldname": "columns", "fieldtype": "Int", "hidden": 0, @@ -1093,4 +1093,4 @@ "read_only_onload": 0, "sort_order": "ASC", "track_seen": 0 -} \ No newline at end of file +} diff --git a/frappe/public/js/frappe/list/listview.js b/frappe/public/js/frappe/list/listview.js index e68132b415..6b90a053bf 100644 --- a/frappe/public/js/frappe/list/listview.js +++ b/frappe/public/js/frappe/list/listview.js @@ -178,6 +178,12 @@ frappe.views.ListView = Class.extend({ } else if(df.fieldtype=="Text Editor" || df.fieldtype=="Text") { colspan = 4; } + if(df.columns && df.columns>0){ + colspan = df.columns; + } + else if(this.settings.column_colspan && this.settings.column_colspan[df.fieldname]) { + colspan = this.settings.column_colspan[df.fieldname]; + } this.total_colspans += parseInt(colspan); var col = { colspan: colspan,