From 17b4fe7a8bfe436b6749fce7c3f4715da33311f0 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 25 Mar 2015 12:01:28 +0530 Subject: [PATCH 1/3] [website] set parent website route, only if parent is published --- frappe/website/website_generator.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py index f29ea0d269..d1388634b4 100644 --- a/frappe/website/website_generator.py +++ b/frappe/website/website_generator.py @@ -83,8 +83,11 @@ class WebsiteGenerator(Document): field = self.meta.get_field(self.parent_website_route_field) parent = self.get(self.parent_website_route_field) if parent: - self.parent_website_route = frappe.get_doc(field.options, - parent).get_route() + parent_doc = frappe.get_doc(field.options, parent) + if parent_doc.website_published(): + self.parent_website_route = parent_doc.get_route() + else: + self.parent_website_route = None def update_routes_of_descendants(self, old_route = None): if not self.is_new() and self.meta.get_field("parent_website_route"): From 0127bf3a0163852bcf0f4caac8f5214d5a48b917 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 26 Mar 2015 18:06:33 +0530 Subject: [PATCH 2/3] [minor] print format --- frappe/core/doctype/print_format/print_format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/print_format/print_format.py b/frappe/core/doctype/print_format/print_format.py index 4de0b05d33..77908889e5 100644 --- a/frappe/core/doctype/print_format/print_format.py +++ b/frappe/core/doctype/print_format/print_format.py @@ -19,7 +19,7 @@ class PrintFormat(Document): jenv = frappe.get_jenv() try: - jenv.from_string(self.html) + jenv.from_string(self.html or "") except TemplateSyntaxError, e: frappe.msgprint('Line {}: {}'.format(e.lineno, e.message)) frappe.throw(frappe._("Syntax error in Jinja template")) From 4a6c1fa2574f384c124a4f68a9081f9e0ff857b8 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 30 Mar 2015 13:02:55 +0600 Subject: [PATCH 3/3] bumped to version 4.13.5 --- 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 515438b6a8..29c39694fb 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "4.13.4" +__version__ = "4.13.5" diff --git a/frappe/hooks.py b/frappe/hooks.py index c7adeb5ce2..8b6fafd18e 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -4,7 +4,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.13.4" +app_version = "4.13.5" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index af620767e4..166e103f80 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.13.4" +version = "4.13.5" with open("requirements.txt", "r") as f: install_requires = f.readlines()