From 4aa0c1402f98a0ef427131819cd4a7baf0089026 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 29 Dec 2023 15:07:20 +0530 Subject: [PATCH] fix: renamed list view settings to view settings --- crm/api/doc.py | 4 ++-- .../__init__.py | 0 .../crm_view_settings.js} | 2 +- .../crm_view_settings.json} | 2 +- .../crm_view_settings.py} | 16 ++++++++-------- .../test_crm_view_settings.py} | 2 +- frontend/src/components/ViewSettings.vue | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) rename crm/fcrm/doctype/{crm_list_view_settings => crm_view_settings}/__init__.py (100%) rename crm/fcrm/doctype/{crm_list_view_settings/crm_list_view_settings.js => crm_view_settings/crm_view_settings.js} (76%) rename crm/fcrm/doctype/{crm_list_view_settings/crm_list_view_settings.json => crm_view_settings/crm_view_settings.json} (96%) rename crm/fcrm/doctype/{crm_list_view_settings/crm_list_view_settings.py => crm_view_settings/crm_view_settings.py} (68%) rename crm/fcrm/doctype/{crm_list_view_settings/test_crm_list_view_settings.py => crm_view_settings/test_crm_view_settings.py} (77%) diff --git a/crm/api/doc.py b/crm/api/doc.py index d109f409..4f5d71c9 100644 --- a/crm/api/doc.py +++ b/crm/api/doc.py @@ -59,8 +59,8 @@ def get_list_data(doctype: str, filters: dict, order_by: str): is_default = True - if frappe.db.exists("CRM List View Settings", doctype): - list_view_settings = frappe.get_doc("CRM List View Settings", doctype) + if frappe.db.exists("CRM View Settings", doctype): + list_view_settings = frappe.get_doc("CRM View Settings", doctype) columns = frappe.parse_json(list_view_settings.columns) rows = frappe.parse_json(list_view_settings.rows) is_default = False diff --git a/crm/fcrm/doctype/crm_list_view_settings/__init__.py b/crm/fcrm/doctype/crm_view_settings/__init__.py similarity index 100% rename from crm/fcrm/doctype/crm_list_view_settings/__init__.py rename to crm/fcrm/doctype/crm_view_settings/__init__.py diff --git a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.js b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.js similarity index 76% rename from crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.js rename to crm/fcrm/doctype/crm_view_settings/crm_view_settings.js index 87850935..df838f2f 100644 --- a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.js +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.js @@ -1,7 +1,7 @@ // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -// frappe.ui.form.on("CRM List View Settings", { +// frappe.ui.form.on("CRM View Settings", { // refresh(frm) { // }, diff --git a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json similarity index 96% rename from crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json rename to crm/fcrm/doctype/crm_view_settings/crm_view_settings.json index 5806c815..a262dfa8 100644 --- a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json @@ -33,7 +33,7 @@ "modified": "2023-11-28 00:17:42.675332", "modified_by": "Administrator", "module": "FCRM", - "name": "CRM List View Settings", + "name": "CRM View Settings", "naming_rule": "Set by user", "owner": "Administrator", "permissions": [ diff --git a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py similarity index 68% rename from crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.py rename to crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index 66770ce8..4b4faefb 100644 --- a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -5,7 +5,7 @@ import frappe from frappe.model.document import Document, get_controller -class CRMListViewSettings(Document): +class CRMViewSettings(Document): pass @@ -18,16 +18,16 @@ def update(doctype, columns, rows): rows = remove_duplicates(rows) - if not frappe.db.exists("CRM List View Settings", doctype): - # create new CRM List View Settings - doc = frappe.new_doc("CRM List View Settings") + if not frappe.db.exists("CRM View Settings", doctype): + # create new CRM View Settings + doc = frappe.new_doc("CRM View Settings") doc.name = doctype doc.columns = json.dumps(columns) doc.rows = json.dumps(rows) doc.insert() else: - # update existing CRM List View Settings - doc = frappe.get_doc("CRM List View Settings", doctype) + # update existing CRM View Settings + doc = frappe.get_doc("CRM View Settings", doctype) doc.columns = json.dumps(columns) doc.rows = json.dumps(rows) doc.save() @@ -46,5 +46,5 @@ def sync_default_list_rows(doctype): @frappe.whitelist() def reset_to_default(doctype): - if frappe.db.exists("CRM List View Settings", doctype): - frappe.delete_doc("CRM List View Settings", doctype) \ No newline at end of file + if frappe.db.exists("CRM View Settings", doctype): + frappe.delete_doc("CRM View Settings", doctype) \ No newline at end of file diff --git a/crm/fcrm/doctype/crm_list_view_settings/test_crm_list_view_settings.py b/crm/fcrm/doctype/crm_view_settings/test_crm_view_settings.py similarity index 77% rename from crm/fcrm/doctype/crm_list_view_settings/test_crm_list_view_settings.py rename to crm/fcrm/doctype/crm_view_settings/test_crm_view_settings.py index d99027bc..cd6df2d7 100644 --- a/crm/fcrm/doctype/crm_list_view_settings/test_crm_list_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/test_crm_view_settings.py @@ -5,5 +5,5 @@ from frappe.tests.utils import FrappeTestCase -class TestCRMListViewSettings(FrappeTestCase): +class TestCRMViewSettings(FrappeTestCase): pass diff --git a/frontend/src/components/ViewSettings.vue b/frontend/src/components/ViewSettings.vue index f6189b96..2177e41f 100644 --- a/frontend/src/components/ViewSettings.vue +++ b/frontend/src/components/ViewSettings.vue @@ -228,7 +228,7 @@ function cancelUpdate() { async function updateColumnDetails() { is_default.value = false await call( - 'crm.fcrm.doctype.crm_list_view_settings.crm_list_view_settings.update', + 'crm.fcrm.doctype.crm_view_settings.crm_view_settings.update', { doctype: props.doctype, columns: columns.value, @@ -239,7 +239,7 @@ async function updateColumnDetails() { async function resetToDefault() { await call( - 'crm.fcrm.doctype.crm_list_view_settings.crm_list_view_settings.reset_to_default', + 'crm.fcrm.doctype.crm_view_settings.crm_view_settings.reset_to_default', { doctype: props.doctype, }