Merge branch 'release/v17.0.5'

rowers/templates/confirmemailpage.html

@@ -0,0 +1,19 @@
+{% extends "newbase.html" %}
+{% load static %}
+{% load rowerfilters %}
+
+{% block title %}Change Rower {% endblock %}
+
+{% block main %}
+<h1>Please confirm your email address</h1>
+
+<p>Please confirm your email address to complete your registration. An email has been sent to {{ address }}.
+  Please check the inbox in your email app.
+If this is not a valid email address that you have access to, please repeat the new user registration process
+with a valid email address.</p>
+
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_profile.html' %}
+{% endblock %}

rowers/templates/invalid_activation.html

@@ -0,0 +1,16 @@
+{% extends "newbase.html" %}
+{% load static %}
+{% load rowerfilters %}
+
+{% block title %}Change Rower {% endblock %}
+
+{% block main %}
+<h1>Error</h1>
+
+<p>Your activation link is invalid. Please use a valid activation link that you received by email or try to register again as a new user.</p>
+
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_profile.html' %}
+{% endblock %}

rowers/views/paymentviews.py

@@ -790,7 +790,9 @@ def useractivate(request, uidb64, token): # pragma: no cover
             url+='?next=/rowers/me/teams'
         return HttpResponseRedirect(url)
     else:
-        return HttpResponse('Activation link is invalid!')
+        return render(request,
+                      "invalid_activation.html",
+                    {} )
 
 
 
@@ -870,12 +872,12 @@ def rower_register_view(request):
                 mail_subject, message, to=[to_email]
             )
             email.send()
-            return HttpResponse('Please confirm your email address to complete the registration')
+            return render(request,'confirmemailpage.html',{'address':to_email})
 
 
-            login(request,theuser)
+        #    login(request,theuser)
 
-            return HttpResponseRedirect(nextpage)
+        #    return HttpResponseRedirect(nextpage)
         #        '/rowers/register/thankyou/')
 
         else: # pragma: no cover