From c7266bbaaf635683f3c9b126bb614c2305de68a6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 21 Dec 2015 21:53:26 +0530 Subject: [PATCH 1/2] [fix] bypass error if Website Theme isn't found. This could lead to untraceable error when rendering error page. --- frappe/website/doctype/website_theme/website_theme.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 2cea0329f4..93fab3a092 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -83,5 +83,7 @@ def add_website_theme(context): def get_active_theme(): website_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme") if website_theme: - return frappe.get_doc("Website Theme", website_theme) - + try: + return frappe.get_doc("Website Theme", website_theme) + except frappe.DoesNotExistError: + pass From 59bdd70e614ed8d3893274ee653a567a4e669233 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 22 Dec 2015 12:20:25 +0600 Subject: [PATCH 2/2] bumped to version 6.15.2 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index b15aed205a..51fc0721fd 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.15.1" +__version__ = "6.15.2" diff --git a/frappe/hooks.py b/frappe/hooks.py index f5a8d177d4..e6358e3bf0 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.15.1" +app_version = "6.15.2" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index d5d02490d7..4d41ee7d4d 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.15.1" +version = "6.15.2" requirements = parse_requirements("requirements.txt", session="") setup(