gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-bank] 04/05: fix +n for 'delta'


From: gnunet
Subject: [GNUnet-SVN] [taler-bank] 04/05: fix +n for 'delta'
Date: Wed, 10 May 2017 16:22:07 +0200

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

commit 669fff8c71993d49dddca5546cf103ec86667b52
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed May 10 14:02:42 2017 +0200

    fix +n for 'delta'
---
 configure.ac           | 1 -
 talerbank/app/tests.py | 6 +++---
 talerbank/app/views.py | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 92a401b..3082b5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,6 @@ fi
 
 AC_CONFIG_FILES([Makefile
  bank.wsgi
- bank-admin.wsgi
  taler-bank-manage
  talerbank/Makefile
  talerbank/app/Makefile
diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index 91e3191..3d93e5a 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.auth.models import User
 from .models import BankAccount
-from . import urlsadmin, urls
+from . import urls
 from . import amounts
 from .views import wire_transfer
 import json
@@ -133,7 +133,7 @@ class HistoryTestCase(TestCase):
         data = json.loads(data)
         self.assertEqual(data["data"][0]["subject"], "h")
         # Get non-existent record: the latest plus one in the future
-        response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "+1", "start": "10"},
+        response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "1", "start": "10"},
                          **{"HTTP_X_TALER_BANK_USERNAME": "User", 
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
         self.assertEqual(204, response.status_code)
         # Get credit records
@@ -232,7 +232,7 @@ class AddIncomingTestCase(TestCase):
                     "fraction": 0, \
                     "currency": "%s"}}' \
                % settings.TALER_CURRENCY
-        response = c.post(reverse("add-incoming", urlconf=urlsadmin),
+        response = c.post(reverse("add-incoming", urlconf=urls),
                           data=data,
                           content_type="application/json",
                           follow=True, **{"HTTP_X_TALER_BANK_USERNAME": 
"user_user", "HTTP_X_TALER_BANK_PASSWORD": "user_password"})
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index a0be3b4..b6b4095 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -352,13 +352,14 @@ def history(request):
         start = int(start)
 
     sign = parsed_delta.group(1)
+
     if not start:
         sign = "-"
     # Assuming Q() means 'true'
     sign_filter = Q()
     if "-" == sign and start:
         sign_filter = Q(id__lt=start)
-    elif ("+" == sign or "" == sign) and start:
+    elif ("+" == sign or not sign) and start:
         sign_filter = Q(id__gt=start)
         sign = ""
     # direction (debit/credit)
@@ -421,7 +422,7 @@ def auth_and_login(request):
 
     username = request.META.get("HTTP_X_TALER_BANK_USERNAME")
     password = request.META.get("HTTP_X_TALER_BANK_PASSWORD")
-    logger.info("Trying to log '%s/%s' in" % (username, password))
+    # logger.info("Trying to log '%s/%s' in" % (username, password))
     if not username or not password:
         return False
     return django.contrib.auth.authenticate(username=username,

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]