From 1717ec0fa87f0c6a3a8314fbc4670cc4c6c5f117 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sat, 1 Jun 2024 14:23:46 +0530 Subject: [PATCH] fix: allow saving/updating group_by view --- crm/fcrm/doctype/crm_view_settings/crm_view_settings.py | 2 ++ frontend/src/components/Modals/ViewModal.vue | 1 + frontend/src/components/ViewControls.vue | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index af5dcbd3..56c959ea 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -27,6 +27,7 @@ def create(view): doc = frappe.new_doc("CRM View Settings") doc.name = view.label doc.label = view.label + doc.type = view.type or 'list' doc.icon = view.icon doc.dt = view.doctype doc.user = frappe.session.user @@ -53,6 +54,7 @@ def update(view): doc = frappe.get_doc("CRM View Settings", view.name) doc.label = view.label + doc.type = view.type or 'list' doc.icon = view.icon doc.route_name = view.route_name or "" doc.load_default_columns = view.load_default_columns or False diff --git a/frontend/src/components/Modals/ViewModal.vue b/frontend/src/components/Modals/ViewModal.vue index 5ac333c0..3ef9d1e4 100644 --- a/frontend/src/components/Modals/ViewModal.vue +++ b/frontend/src/components/Modals/ViewModal.vue @@ -75,6 +75,7 @@ const duplicateMode = ref(false) const _view = ref({ name: '', label: '', + type: 'list', icon: '', filters: {}, order_by: 'modified desc', diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue index 8d33e6e6..d14ff256 100644 --- a/frontend/src/components/ViewControls.vue +++ b/frontend/src/components/ViewControls.vue @@ -227,7 +227,11 @@ afterCreate: async (v) => { await reloadView() viewUpdated = false - router.push({ name: route.name, query: { view: v.name } }) + router.push({ + name: route.name, + params: { viewType: v.type || 'list' }, + query: { view: v.name }, + }) }, afterUpdate: () => { viewUpdated = false