diff --git a/webnotes/__init__.py b/webnotes/__init__.py index d2cb3b25f0..a172654527 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -388,7 +388,8 @@ def get_all_apps(with_webnotes=False): def get_installed_apps(): if flags.in_install_db: return [] - return json.loads(conn.get_global("installed_apps") or "[]") + installed = json.loads(conn.get_global("installed_apps") or "[]") + return installed def get_hooks(app_name=None): def load_app_hooks(app_name=None): diff --git a/webnotes/website/doctype/website_sitemap_config/website_sitemap_config.py b/webnotes/website/doctype/website_sitemap_config/website_sitemap_config.py index cc681d6239..6a7eed2603 100644 --- a/webnotes/website/doctype/website_sitemap_config/website_sitemap_config.py +++ b/webnotes/website/doctype/website_sitemap_config/website_sitemap_config.py @@ -75,7 +75,11 @@ def add_website_sitemap_config(page_or_generator, app, path, fname, basepath): wsc.ref_doctype = getattr(module, "doctype", None) wsc.page_name_field = getattr(module, "page_name_field", "page_name") wsc.condition_field = getattr(module, "condition_field", None) - + + if webnotes.conn.exists("Website Sitemap Config", wsc.link_name): + # found by earlier app, override + webnotes.delete_doc("Website Sitemap Config", wsc.link_name) + webnotes.bean(wsc).insert() return name