Merge lp:~widelands-dev/widelands-website/post_registration_cleanup into lp:widelands-website

Proposed by kaputtnik
Status: Merged
Merged at revision: 526
Proposed branch: lp:~widelands-dev/widelands-website/post_registration_cleanup
Merge into: lp:widelands-website
Diff against target: 51 lines (+4/-22)
3 files modified
templates/django_registration/activate.html (+0/-21)
templates/django_registration/activation_failed.html (+3/-0)
urls.py (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands-website/post_registration_cleanup
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+364274@code.launchpad.net

Description of the change

The latest server errors occur because:

1. I have overlooked renaming a template, so it was missing
2. Added the missing template as a new template... this was accidentally done this morning on alpha instead of wl.widelands.org. Took me two hours to find this mistake :D

So this branch is just a small cleanup.

- removed a (now) unused template
- fixed a url

To be clear i have also checked if registering is working, and the result is fine.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Ouch, sounds like you did not have fun.

Code looks good :)

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

That's always a bit thrilling...

Merged and deployed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'templates/django_registration/activate.html'
--- templates/django_registration/activate.html 2019-03-06 16:37:05 +0000
+++ templates/django_registration/activate.html 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1{% extends "mainpage/base.html" %}
2{% comment %}
3vim:ft=htmldjango:
4{% endcomment %}
5
6{% block title %}
7Activation - {{ block.super }}
8{% endblock %}
9
10{% block content_header %}
11 <h1>Activation</h1>
12{% endblock %}
13
14{% block content_main %}
15<div class="blogEntry">
16 <p class="errormessage">
17 An error occured: Either this account has already been activated or activation key is invalid.<br />
18 Try <a href="{% url 'login' %}">logging in</a>.
19 </p>
20</div>
21{% endblock %}
220
=== modified file 'templates/django_registration/activation_failed.html'
--- templates/django_registration/activation_failed.html 2019-03-11 06:23:17 +0000
+++ templates/django_registration/activation_failed.html 2019-03-11 19:58:28 +0000
@@ -13,5 +13,8 @@
13 <p>13 <p>
14 An error occured during activation: {{ activation_error.message }}14 An error occured during activation: {{ activation_error.message }}
15 </p>15 </p>
16 <p>
17 You can try to <a href="{% url 'login' %}">log in</a>.
18 </p>
16 </div>19 </div>
17 {% endblock %}20 {% endblock %}
1821
=== modified file 'urls.py'
--- urls.py 2019-03-03 15:17:58 +0000
+++ urls.py 2019-03-11 19:58:28 +0000
@@ -25,7 +25,7 @@
25 url(r'^accounts/register/$', RegistrationView.as_view(25 url(r'^accounts/register/$', RegistrationView.as_view(
26 form_class=RegistrationWithCaptchaForm), name='django_registration_register'),26 form_class=RegistrationWithCaptchaForm), name='django_registration_register'),
27 url(r'^accounts/', include('django_registration.backends.activation.urls')),27 url(r'^accounts/', include('django_registration.backends.activation.urls')),
28 url('^', include('django.contrib.auth.urls')),28 url(r'^', include('django.contrib.auth.urls')),
2929
30 url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),30 url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),
31 # Formerly 3rd party31 # Formerly 3rd party

Subscribers

People subscribed via source and target branches