From d8409f9fc2c65b1a6f39d2b30d5e3003872610fe Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 10 Jan 2014 14:33:41 +0530 Subject: [PATCH] Pass filters to get_template, Website: split page name by / --- webnotes/__init__.py | 10 +++++++--- webnotes/webutils.py | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/webnotes/__init__.py b/webnotes/__init__.py index 2bc31ebb99..49a3aa2188 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -528,8 +528,12 @@ def get_jenv(): jenv.filters["global_date_format"] = global_date_format jenv.filters["markdown"] = markdown jenv.filters["json"] = dumps - + return jenv -def get_template(path): - return get_jenv().get_template(path) +def get_template(path, filters=None): + _jenv = get_jenv() + if filters: + _jenv.filters.update(filters) + + return _jenv.get_template(path) diff --git a/webnotes/webutils.py b/webnotes/webutils.py index 41e2c1d838..5cab49a234 100644 --- a/webnotes/webutils.py +++ b/webnotes/webutils.py @@ -16,6 +16,9 @@ def render(page_name): """render html page""" if not page_name: page_name = "index" + + if "/" in page_name: + page_name = page_name.split("/")[0] try: html = render_page(page_name)