[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] branch master updated: Finish fixing #4949's m
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-bank] branch master updated: Finish fixing #4949's minor issues. |
Date: |
Thu, 23 Mar 2017 15:15:39 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository bank.
The following commit(s) were added to refs/heads/master by this push:
new 95810a8 Finish fixing #4949's minor issues.
95810a8 is described below
commit 95810a85bfc3fc750005246a4cdbf7f85b4729f5
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Mar 23 15:15:30 2017 +0100
Finish fixing #4949's minor issues.
---
talerbank/app/templates/profile_page.html | 2 +-
talerbank/app/views.py | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/talerbank/app/templates/profile_page.html
b/talerbank/app/templates/profile_page.html
index d4c5e29..cc4b47d 100644
--- a/talerbank/app/templates/profile_page.html
+++ b/talerbank/app/templates/profile_page.html
@@ -45,7 +45,7 @@
<section id="main">
<article>
<div class="notification">
- {% if not initial_bonus %}
+ {% if no_initial_bonus %}
<p class="informational informational-fail">
No initial bonus given, poor bank!
</p>
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index 8618316..945b984 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -88,7 +88,7 @@ def get_session_flag(request, name):
def profile_page(request):
just_withdrawn = get_session_flag(request, "just_withdrawn")
just_registered = get_session_flag(request, "just_registered")
- initial_bonus = get_session_flag(request, "initial_bonus")
+ no_initial_bonus = get_session_flag(request, "no_initial_bonus")
user_account = BankAccount.objects.get(user=request.user)
history = extract_history(user_account)
reserve_pub = request.session.get("reserve_pub")
@@ -102,13 +102,14 @@ def profile_page(request):
context = dict(
name=user_account.user.username,
- balance=amounts.stringify(user_account.balance),
+ balance=amounts.stringify(amounts.floatify(user_account.balance_obj)),
currency=user_account.currency,
precision=settings.TALER_DIGITS,
account_no=user_account.account_no,
history=history,
just_withdrawn=just_withdrawn,
just_registered=just_registered,
+ no_initial_bonus=no_initial_bonus,
use_js=use_js,
)
logger.info("Profile context: '%s'", json.dumps(context))
@@ -271,7 +272,7 @@ def register(request):
wire_transfer(amount, bank_internal_account, user_account, "Joining
bonus")
except DebtLimitExceededException:
logger.info("Debt situation encountered")
- request.session["initial_bonus"] = False
+ request.session["no_initial_bonus"] = True
request.session["just_registered"] = True
user = django.contrib.auth.authenticate(username=username,
password=password)
django.contrib.auth.login(request, user)
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-bank] branch master updated: Finish fixing #4949's minor issues.,
gnunet <=