diff --git a/frappe/website/template.py b/frappe/website/template.py index da51af4c6d..c37585807f 100644 --- a/frappe/website/template.py +++ b/frappe/website/template.py @@ -64,11 +64,11 @@ def render_blocks(context): out["content"] = out["content"].replace("{index}", html) if "{next}" in out.get("content", ""): - next_item = context.get_next() + next_item = context.doc.get_next() if next_item: if next_item.name[0]!="/": next_item.name = "/" + next_item.name html = '''


- {page_title} + {title}

'''.format(**next_item) out["content"] = out["content"].replace("{next}", html) diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py index 0db57269ae..e9cb8678dd 100644 --- a/frappe/website/website_generator.py +++ b/frappe/website/website_generator.py @@ -149,6 +149,10 @@ class WebsiteGenerator(Document): parents.reverse() return parents + def get_parent(self): + if hasattr(self, "parent_website_route_field"): + return self.get(self.parent_website_route_field) + def get_children(self): if self.get_route()==get_home_page(): return frappe.db.sql("""select url as name, label as page_title, @@ -183,8 +187,7 @@ class WebsiteGenerator(Document): def get_next(self): if self.meta.get_field("parent_website_route") and self.parent_website_route: route = self.get_route() - siblings = frappe.get_doc(self.doctype, - self.parent_website_route).get_children() + siblings = frappe.get_doc(self.doctype, self.get_parent()).get_children() for i, r in enumerate(siblings): if i < len(siblings) - 1: if route==r.name: