test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: load correct view

Browse Source
This commit is contained in:
Shariq Ansari 2024-06-01 23:25:56 +05:30
parent 3a0d07e303
commit 5727fb412b
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crm/api/doc.py
View File

@ -201,8 +201,15 @@ def get_list_data(
if not rows: if not rows:
rows = ["name"] rows = ["name"]
if not custom_view and frappe.db.exists("CRM View Settings", {"dt": doctype, "type": view_type}): default_view_filters = {
list_view_settings = frappe.get_doc("CRM View Settings", {"dt": doctype, "type": view_type}) "dt": doctype,
"type": view_type,
"is_default": 1,
"user": frappe.session.user,
}
if not custom_view and frappe.db.exists("CRM View Settings", default_view_filters):
list_view_settings = frappe.get_doc("CRM View Settings", default_view_filters)
columns = frappe.parse_json(list_view_settings.columns) columns = frappe.parse_json(list_view_settings.columns)
rows = frappe.parse_json(list_view_settings.rows) rows = frappe.parse_json(list_view_settings.rows)
is_default = False is_default = False

12
frontend/src/stores/views.js
View File

@ -26,8 +26,8 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
if (view.public) { if (view.public) {
publicViews.value?.push(view) publicViews.value?.push(view)
} }
if (view.is_default && view.dt) { if (view.is_default && view.dt && view.type) {
defaultView.value[view.dt] = view defaultView.value[view.dt + ' ' + view.type] = view
} }
} }
return views return views
@ -35,12 +35,8 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
}) })
function getView(view, type, doctype = null) { function getView(view, type, doctype = null) {
if (!view && doctype) { if (!view && doctype && type) {
let _view = defaultView.value[doctype] || null return defaultView.value[doctype + ' ' + type] || null
if (_view && _view['type'] !== type) {
_view = null
}
return _view
} }
return viewsByName[view] return viewsByName[view]
} }