diff options
| -rw-r--r-- | talerbank/app/urls.py | 5 | ||||
| -rw-r--r-- | talerbank/app/views.py | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py index b0a0e52..19c0169 100644 --- a/talerbank/app/urls.py +++ b/talerbank/app/urls.py @@ -37,7 +37,10 @@ urlpatterns = [ url(r'^withdraw$', views.withdraw_nojs, name="withdraw-nojs"), url(r'^public-accounts$', views.serve_public_accounts, name="public-accounts"), - url(r'^public-accounts/(?P<name>[a-zA-Z0-9 ]+)$', + url(r'^public-accounts/(?P<name>[a-zA-Z0-9]+)$', + views.serve_public_accounts, + name="public-accounts"), + url(r'^public-accounts/(?P<name>[a-zA-Z0-9]+)/(?P<page>[0-9]+)$', views.serve_public_accounts, name="public-accounts"), url(r'^pin/question$', views.pin_tan_question, diff --git a/talerbank/app/views.py b/talerbank/app/views.py index ff13a21..e45926e 100644 --- a/talerbank/app/views.py +++ b/talerbank/app/views.py @@ -321,7 +321,6 @@ def logout_view(request): def extract_history(account, delta=None, start=-1, sign="+"): - print(account, delta, start, sign) history = [] qs = query_history(account, "both", delta, start, sign) for item in qs: @@ -346,6 +345,12 @@ def extract_history(account, delta=None, start=-1, sign="+"): def serve_public_accounts(request, name=None, page=None): + + try: + page = int(page) + except Exception: + page = 1 + if not name: name = settings.TALER_PREDEFINED_ACCOUNTS[0] user = User.objects.get(username=name) |