summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <corvus@inaugust.com>2012-12-09 19:05:16 (GMT)
committerJames E. Blair <corvus@inaugust.com>2012-12-09 19:05:16 (GMT)
commit1a1abe54557aa1a3510d12e644e6b3a0bb9b137d (patch)
tree48a89453a6cd1ed8674a76562eab122901036220
parentf87043af6e9e8b97eb1717c7d07f0a51743adc0f (diff)
Fixes for TurboGears 2.1.5.
-rw-r--r--quoins/controllers.py4
-rw-r--r--quoins/templates/index.html4
2 files changed, 5 insertions, 3 deletions
diff --git a/quoins/controllers.py b/quoins/controllers.py
index 656aec8..c0555a6 100644
--- a/quoins/controllers.py
+++ b/quoins/controllers.py
@@ -367,6 +367,9 @@ class BlogController(TGController):
367 m = ID_RE.match(id) 367 m = ID_RE.match(id)
368 return m.group(1) 368 return m.group(1)
369 369
370 def current_url(self, *args, **kw):
371 return pylons.url.current(*args, **kw)
372
370 def url(self, obj=None): 373 def url(self, obj=None):
371 if obj is None: 374 if obj is None:
372 u = tg.url(self.path) 375 u = tg.url(self.path)
@@ -465,7 +468,6 @@ Comment:
465 pylons.response.headers['X-XRDS-Location']=self.absolute_url('/yadis') 468 pylons.response.headers['X-XRDS-Location']=self.absolute_url('/yadis')
466 blog = DBSession.query(Blog).get(1) 469 blog = DBSession.query(Blog).get(1)
467 d = post_paginate(start, blog.published_posts, self.post_paginate) 470 d = post_paginate(start, blog.published_posts, self.post_paginate)
468
469 d.update(dict(quoins = self, 471 d.update(dict(quoins = self,
470 blog = blog, 472 blog = blog,
471 post = None, 473 post = None,
diff --git a/quoins/templates/index.html b/quoins/templates/index.html
index cf447d4..97bf963 100644
--- a/quoins/templates/index.html
+++ b/quoins/templates/index.html
@@ -58,10 +58,10 @@
58 58
59 <div class="blog-paginate"> 59 <div class="blog-paginate">
60 <span py:if="prev is not None"> 60 <span py:if="prev is not None">
61 <a href="${url.current(start=prev)}">Previous five posts</a> 61 <a href="${quoins.current_url(start=prev)}">Previous five posts</a>
62 </span> 62 </span>
63 <span py:if="next is not None"> 63 <span py:if="next is not None">
64 <a href="${url.current(start=next)}">Next five posts</a> 64 <a href="${quoins.current_url(start=next)}">Next five posts</a>
65 </span> 65 </span>
66 </div> <!-- blog-paginate --> 66 </div> <!-- blog-paginate -->
67 </div> <!-- blog-content --> 67 </div> <!-- blog-content -->