1. get_page template tag can now accept context variable for slug or id

2. IMPORTANT API CHANGE: get_page now required quotes when a slug string is directly used, as stated in the documentation

pages/templatetags/pages_tags.py

@@ -294,12 +294,13 @@ def do_csrf_token(parser, token):
 
 class GetPageNode(template.Node):
     """get_page Node"""
-    def __init__(self, page, varname):
-        self.page = page
+    def __init__(self, page_filter, varname):
+        self.page_filter = page_filter
         self.varname = varname
 
     def render(self, context):
-        page = get_page_from_string_or_id(self.page)
+        page_or_id = self.page_filter.resolve(context)
+        page = get_page_from_string_or_id(page_or_id)
         context[self.varname] = page
         return ''
 
@@ -320,9 +321,9 @@ def do_get_page(parser, token):
     if bits[-2] != 'as':
         raise TemplateSyntaxError(
             '%r expects "as" as the second argument' % bits[0])
-    page = bits[1]
+    page_filter = parser.compile_filter(bits[1])
     varname = bits[-1]
-    return GetPageNode(page, varname)
+    return GetPageNode(page_filter, varname)
 do_get_page = register.tag('get_page', do_get_page)
 
 

pages/tests/test_unit.py

@@ -112,16 +112,16 @@ def test_placeholder_inherit_content(self):
     def test_get_page_template_tag(self):
         """Test get_page template tag."""
         context = Context({})
-        pl1 = """{% load pages_tags %}{% get_page get-page-slug as toto %}{{ toto }}"""
+        pl1 = """{% load pages_tags %}{% get_page "get-page-slug" as toto %}{{ toto }}"""
         template = get_template_from_string(pl1)
         self.assertEqual(template.render(context), u'None')
-        page = self.new_page({'slug':'get-page-slug'})
+        page = self.new_page({'slug': 'get-page-slug'})
         self.assertEqual(template.render(context), u'get-page-slug')
 
     def test_placeholder_all_syntaxes(self):
         """Test placeholder syntaxes."""
         page = self.new_page()
-        context = Context({'current_page': page, 'lang':'en-us'})
+        context = Context({'current_page': page, 'lang': 'en-us'})
 
         pl1 = """{% load pages_tags %}{% placeholder title as hello %}"""
         template = get_template_from_string(pl1)