From 5bda28eae6b193ce3de3eb2b665ef76b33931ef2 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Sun, 19 Jul 2020 00:15:40 +0530 Subject: [PATCH 1/3] fix: reset homepage to home after unchecking products page resets homepage back to home when "home page is products" is unchecked Signed-off-by: Chinmay D. Pai --- .../doctype/products_settings/products_settings.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/portal/doctype/products_settings/products_settings.py b/erpnext/portal/doctype/products_settings/products_settings.py index 82afebf2f1e..92c4f1ca279 100644 --- a/erpnext/portal/doctype/products_settings/products_settings.py +++ b/erpnext/portal/doctype/products_settings/products_settings.py @@ -11,9 +11,9 @@ from frappe.model.document import Document class ProductsSettings(Document): def validate(self): if self.home_page_is_products: - website_settings = frappe.get_doc('Website Settings') - website_settings.home_page = 'products' - website_settings.save() + frappe.db.set_value("Website Settings", "home_page", "products") + elif frappe.get_single_value("Website Settings", "home_page") == 'products': + frappe.db.set_value("Website Settings", "home_page", "home") self.validate_field_filters() self.validate_attribute_filters() @@ -40,4 +40,5 @@ def home_page_is_products(doc, method): home_page_is_products = cint(frappe.db.get_single_value('Products Settings', 'home_page_is_products')) if home_page_is_products: doc.home_page = 'products' - + elif doc.home_page == "products": + doc.home_page = 'home' From 33bf0574a3bcb241283838bfd10bbcae473a844b Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Sun, 19 Jul 2020 15:54:11 +0530 Subject: [PATCH 2/3] chore: fix get single value call Signed-off-by: Chinmay D. Pai --- erpnext/portal/doctype/products_settings/products_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/portal/doctype/products_settings/products_settings.py b/erpnext/portal/doctype/products_settings/products_settings.py index 92c4f1ca279..cb074627747 100644 --- a/erpnext/portal/doctype/products_settings/products_settings.py +++ b/erpnext/portal/doctype/products_settings/products_settings.py @@ -12,7 +12,7 @@ class ProductsSettings(Document): def validate(self): if self.home_page_is_products: frappe.db.set_value("Website Settings", "home_page", "products") - elif frappe.get_single_value("Website Settings", "home_page") == 'products': + elif frappe.db.get_single_value("Website Settings", "home_page") == 'products': frappe.db.set_value("Website Settings", "home_page", "home") self.validate_field_filters() From 3e503e44040e397fc16b7260830bd8279b7043f6 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Thu, 23 Jul 2020 12:05:55 +0530 Subject: [PATCH 3/3] chore: do not reset homepage through hooks Signed-off-by: Chinmay D. Pai --- erpnext/portal/doctype/products_settings/products_settings.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/portal/doctype/products_settings/products_settings.py b/erpnext/portal/doctype/products_settings/products_settings.py index cb074627747..b984aeb67df 100644 --- a/erpnext/portal/doctype/products_settings/products_settings.py +++ b/erpnext/portal/doctype/products_settings/products_settings.py @@ -40,5 +40,3 @@ def home_page_is_products(doc, method): home_page_is_products = cint(frappe.db.get_single_value('Products Settings', 'home_page_is_products')) if home_page_is_products: doc.home_page = 'products' - elif doc.home_page == "products": - doc.home_page = 'home'