summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Yves Chibon <pingou@pingoured.fr>2012-04-23 19:19:27 +0200
committerPierre-Yves Chibon <pingou@pingoured.fr>2012-04-23 19:19:27 +0200
commitd38d30431539c413fc72e5430822c6d51757d4af (patch)
treed82047fe70401cc07a38e41ef9635415d51915d2
parent463c79bd2fffe57cac90c76a336304b0072b1e23 (diff)
downloadhyperkitty-d38d30431539c413fc72e5430822c6d51757d4af.tar.gz
hyperkitty-d38d30431539c413fc72e5430822c6d51757d4af.tar.xz
hyperkitty-d38d30431539c413fc72e5430822c6d51757d4af.zip
Attempt to improve the detection of the page number
-rw-r--r--templatetags/poll_extras.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/templatetags/poll_extras.py b/templatetags/poll_extras.py
index 86d8112..720fb59 100644
--- a/templatetags/poll_extras.py
+++ b/templatetags/poll_extras.py
@@ -33,11 +33,18 @@ def to_month(value):
@register.filter(name="strip_page")
def strip_page(value):
- print repr(value)
+ print repr(value), repr(value)[-2]
if not value:
return value
if value.endswith('/'):
- output = value.rsplit('/', 2)
+ end_with_number = False
+ try:
+ if int(value[-2]) in range(0,10):
+ end_with_number = True
+ if end_with_number:
+ output = value.rsplit('/', 2)
+ except ValueError:
+ output = value.rsplit('/', 1)
else:
output = value.rsplit('/', 1)
return output[0]