fix: rebase issue

This commit is contained in:
Shariq Ansari 2025-01-16 21:27:31 +05:30
parent d6ab3b96e2
commit e6a5da4c1b

View File

@ -182,11 +182,6 @@ def get_quick_filters(doctype: str):
for field in fields:
options = field.options
if field.fieldtype == "Select" and options and isinstance(options, str):
options = options.split("\n")
options = [{"label": option, "value": option} for option in options]
options.insert(0, {"label": "", "value": ""})
options = field.options
if field.fieldtype == "Select" and options and isinstance(options, str):
options = options.split("\n")
options = [{"label": option, "value": option} for option in options]
@ -197,7 +192,6 @@ def get_quick_filters(doctype: str):
"name": field.fieldname,
"type": field.fieldtype,
"options": options,
"options": options,
}
)
@ -285,7 +279,6 @@ def get_data(
columns = frappe.parse_json(list_view_settings.columns)
rows = frappe.parse_json(list_view_settings.rows)
is_default = False
elif not custom_view or (is_default and hasattr(_list, "default_list_data")):
elif not custom_view or (is_default and hasattr(_list, "default_list_data")):
rows = default_rows
columns = _list.default_list_data().get("columns")
@ -349,7 +342,6 @@ def get_data(
for kc in kanban_columns:
column_filters = {column_field: kc.get("name")}
order = kc.get("order")
if (column_field in filters and filters.get(column_field) != kc.name) or kc.get("delete"):
if (column_field in filters and filters.get(column_field) != kc.name) or kc.get("delete"):
column_data = []
else: