aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-13 17:23:12 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-04-13 17:23:12 +0200
commit176459ec20d1c9ad771fa9caeba06e6133b8ead6 (patch)
tree1d51e4c911aebdbbdaa9ca5af8271987b959a630
parentd334d8541305ad63e93fe2b44d38434d3f9d1daa (diff)
downloadbank-176459ec20d1c9ad771fa9caeba06e6133b8ead6.tar.gz
bank-176459ec20d1c9ad771fa9caeba06e6133b8ead6.tar.bz2
bank-176459ec20d1c9ad771fa9caeba06e6133b8ead6.zip
fix urls
-rw-r--r--bank.conf3
-rw-r--r--talerbank/app/history.py4
-rw-r--r--talerbank/app/templates/public_histories_reloaded.html2
-rw-r--r--talerbank/app/urls.py22
4 files changed, 16 insertions, 15 deletions
diff --git a/bank.conf b/bank.conf
new file mode 100644
index 0000000..6b33eb3
--- /dev/null
+++ b/bank.conf
@@ -0,0 +1,3 @@
+[bank]
+uwsgi_port = 8001
+database = talerbank
diff --git a/talerbank/app/history.py b/talerbank/app/history.py
index b3f3e38..a0a9e5e 100644
--- a/talerbank/app/history.py
+++ b/talerbank/app/history.py
@@ -34,7 +34,6 @@ def extract_history(bank_account):
return ret
-@check_db
@is_logged
def history_process(request):
user_bank_account = get_logged_user_account(request.session['account_no'])
@@ -43,14 +42,13 @@ def history_process(request):
return render(request, 'history.html', {'history': render_history})
-@check_db
def public_accounts_process(request):
accounts = []
for item in get_public_accounts():
accounts.append({'account_name': item.user.username})
sel_account_name = request.GET.get('account')
if not sel_account_name:
- return redirect("/public-accounts/?account=Tor")
+ return redirect("/public-accounts?account=Tor")
sel_account = get_bank_account_from_username(sel_account_name)
if sel_account == False:
return internal_error_handler(request, "User '%s' does not exist" % (sel_account_name,))
diff --git a/talerbank/app/templates/public_histories_reloaded.html b/talerbank/app/templates/public_histories_reloaded.html
index 4551326..e3acc58 100644
--- a/talerbank/app/templates/public_histories_reloaded.html
+++ b/talerbank/app/templates/public_histories_reloaded.html
@@ -44,7 +44,7 @@
{% for item in public_accounts %}
<td width="12%" align="center">
<a id="{{ item.account_name }}"
- href="/public-accounts/?account={{ item.account_name }}">
+ href="/public-accounts?account={{ item.account_name }}">
{{ item.account_name }}
</a>
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index aabb221..de7b327 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -22,15 +22,15 @@ from . import views
urlpatterns = [
url(r'^$', views.home_page),
url(r'^favicon\.ico$', views.ignore),
- url(r'register', views.register_process),
- url(r'login', views.login_process),
- url(r'logout', views.logout_process),
- url(r'withdraw', views.withdraw_process),
- url(r'public-accounts/details', views.view_public_accno_process),
- url(r'public-accounts', views.public_accounts_process),
- url(r'pin/question', views.pin_tan_question),
- url(r'pin/verify', views.pin_tan_verify),
- url(r'add/incoming', views.add_incoming_attempt),
- url(r'profile', views.profile_process),
- url(r'history', views.history_process)
+ url(r'^register$', views.register_process),
+ url(r'^login$', views.login_process),
+ url(r'^logout$', views.logout_process),
+ url(r'^withdraw$', views.withdraw_process),
+ url(r'^public-accounts/details$', views.view_public_accno_process),
+ url(r'^public-accounts$', views.public_accounts_process),
+ url(r'^pin/question$', views.pin_tan_question),
+ url(r'^pin/verify$', views.pin_tan_verify),
+ url(r'^add/incoming$', views.add_incoming_attempt),
+ url(r'^profile$', views.profile_process),
+ url(r'^history$', views.history_process)
]