Merge 65c8871 into bc2a424

praekeltfoundation · Apr 6, 2017 · 6990578 · 6990578
2 parents bc2a424 + 65c8871
commit 6990578
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/molo/profiles/templates/profiles/login_success.html b/molo/profiles/templates/profiles/login_success.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<h1 class="heading heading--profiles">{% trans "Login Success" %}</h1>
+<div class="profiles">
+    <h4 class="heading heading--feeback-title">{% trans "Login Successful!" %}</h4>
+    <a href="/">{% trans "Home Page" %}</a>
+  </div>
+{% endblock %}
diff --git a/molo/profiles/templates/registration/login.html b/molo/profiles/templates/registration/login.html
@@ -32,7 +32,7 @@ <h4 class="heading heading--subtitle">
 		<span class="input-hint">({% trans "Eg.: 2086" %})</span>
 	</fieldset>
 	<input type="submit" value="{% trans "Log in" %}">
-	<input type="hidden" name="next" value="{% if request.GET.next %}{{ request.GET.next }}{% else %}{{request.site.root_page.url}}{% endif %}" />
+	<input type="hidden" name="next" value="{% url "molo.profiles:login_success" %}" />
 	</form>
 	<a href="{% url "molo.profiles:forgot_password" %}" class="profiles__forgotten-password">{% trans "Forgotten your password?" %}</a>
 </div>

diff --git a/molo/profiles/tests/test_views.py b/molo/profiles/tests/test_views.py
@@ -90,6 +90,10 @@ def test_login(self):
         response = self.client.get(reverse('molo.profiles:auth_login'))
         self.assertContains(response, 'Forgotten your password')
 
+    def test_login_success(self):
+        response = self.client.get(reverse('molo.profiles:login_success'))
+        self.assertContains(response, 'Login Successful!')
+
     def test_warning_message_shown_in_wagtail_if_no_country_code(self):
         site = Site.objects.get(is_default_site=True)
         settings = SettingsProxy(site)

diff --git a/molo/profiles/urls.py b/molo/profiles/urls.py
@@ -52,4 +52,11 @@
         ),
         name="reset_password_success"
     ),
+    url(
+        r"^login-success/$",
+        TemplateView.as_view(
+            template_name="profiles/login_success.html"
+        ),
+        name="login_success"
+    ),
 ]