Merge branch 'develop' into feature/workoutslist
This commit is contained in:
@@ -784,10 +784,11 @@ def useractivate(request, uidb64, token): # pragma: no cover
|
||||
['roosendaalsander@gmail.com'])
|
||||
|
||||
|
||||
messages.info(request,'Thank you for your email confirmation. Now you can login to your account.')
|
||||
url = '/login/'
|
||||
if user.rower.rowerplan == 'freecoach':
|
||||
url+='?next=/rowers/me/teams'
|
||||
messages.info(request,'Thank you for your email confirmation. YOu are now signed in to your account.')
|
||||
login(request, user, backend=settings.AUTHENTICATION_BACKENDS[0])
|
||||
url = reverse('workouts_view')
|
||||
#if user.rower.rowerplan == 'freecoach':
|
||||
# url+='?next=/rowers/me/teams'
|
||||
return HttpResponseRedirect(url)
|
||||
else:
|
||||
return render(request,
|
||||
|
||||
Reference in New Issue
Block a user