fix redirects and debug output

This commit is contained in:
Laura Klünder 2017-12-19 16:04:15 +01:00
parent c1fb344bfb
commit e48efafebc
2 changed files with 4 additions and 3 deletions

View file

@ -1,5 +1,6 @@
import string import string
from functools import wraps from functools import wraps
from urllib.parse import urlencode
from django.conf import settings from django.conf import settings
from django.contrib import messages from django.contrib import messages
@ -165,7 +166,7 @@ def grant_access(request):
token.save() token.save()
if settings.DEBUG and request.user_permissions.api_secret: if settings.DEBUG and request.user_permissions.api_secret:
signed_data = form.get_signed_data() signed_data = form.get_signed_data()
print(signed_data) print('/?'+urlencode({'access': signed_data}))
return redirect(reverse('control.access.qr', kwargs={'token': token.token})) return redirect(reverse('control.access.qr', kwargs={'token': token.token}))
else: else:
form = AccessPermissionForm(request=request) form = AccessPermissionForm(request=request)

View file

@ -69,7 +69,7 @@ def map_index(request, mode=None, slug=None, slug2=None, details=None, options=N
messages.info(request, _('You need to log in to unlock areas.')) messages.info(request, _('You need to log in to unlock areas.'))
request.session['redeem_token_on_login'] = str(token.token) request.session['redeem_token_on_login'] = str(token.token)
token.redeem() token.redeem()
return redirect('site.login') return redirect_to_login(request.path_info, 'site.login')
token.redeem(request.user) token.redeem(request.user)
token.save() token.save()
@ -288,7 +288,7 @@ def access_redeem_view(request, token):
messages.info(request, _('You need to log in to unlock areas.')) messages.info(request, _('You need to log in to unlock areas.'))
request.session['redeem_token_on_login'] = str(token.token) request.session['redeem_token_on_login'] = str(token.token)
token.redeem() token.redeem()
return redirect_to_login(request.path_info, 'site.login') return redirect('site.login')
token.redeem(request.user) token.redeem(request.user)
token.save() token.save()