2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix redirects and debug output

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
src/c3nav/control/views.py
View file

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

4
src/c3nav/site/views.py
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.'))
request.session['redeem_token_on_login'] = str(token.token)
token.redeem()
return redirect('site.login')
return redirect_to_login(request.path_info, 'site.login')
token.redeem(request.user)
token.save()
@ -288,7 +288,7 @@ def access_redeem_view(request, token):
messages.info(request, _('You need to log in to unlock areas.'))
request.session['redeem_token_on_login'] = str(token.token)
token.redeem()
return redirect_to_login(request.path_info, 'site.login')
return redirect('site.login')
token.redeem(request.user)
token.save()