diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-02-07 09:52:15 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-02-07 09:52:15 +0100 |
| commit | 4d37a525e8e5df3c13d98ffe534476fd5973d918 (patch) | |
| tree | 714194fcbf1cd4a8ffc6612ed096c65054e92912 | |
| parent | 60d04970e27e21a622a568b381811ca7256f6db1 (diff) | |
| download | hyperkitty-4d37a525e8e5df3c13d98ffe534476fd5973d918.tar.gz hyperkitty-4d37a525e8e5df3c13d98ffe534476fd5973d918.tar.xz hyperkitty-4d37a525e8e5df3c13d98ffe534476fd5973d918.zip | |
Keep the redirect url when already on the login page
| -rw-r--r-- | hyperkitty/templates/base.html | 4 | ||||
| -rw-r--r-- | hyperkitty/templates/login.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index f93d007..424c86a 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -26,8 +26,8 @@ <li><a class="mm_logout" href="{% url user_logout %}">Logout</a></li> <li><a href="{% url user_profile %}">{{ user.username }}</a></li> {% else %} - <li><a class="mm_user" href="{% url user_login %}?next={{request.path}}">Login</a></li> - <li><a href="{% url user_registration %}?next={{request.path}}"> Sign Up </a></li> + <li><a class="mm_user" href="{% url user_login %}?next={{next|default:request.path}}">Login</a></li> + <li><a href="{% url user_registration %}?next={{next|default:request.path}}"> Sign Up </a></li> {% endif %} </ul> diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html index 3a3bfa6..9bce6ee 100644 --- a/hyperkitty/templates/login.html +++ b/hyperkitty/templates/login.html @@ -30,7 +30,7 @@ <li><a title="Yahoo" class="socialaccount_provider yahoo" href="{% url socialauth_begin backend='yahoo' %}"><img src="{{ STATIC_URL }}img/login/yahoo.png" alt="Yahoo"></a></li> <li> - <form method="post" action="{% url socialauth_complete "browserid" %}?{{redirect_querystring}}"> + <form method="post" action="{% url socialauth_complete "browserid" %}?next={{ next }}"> {% csrf_token %} <input type="hidden" name="assertion" value="" /> <a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}img/login/browserid.png" alt="Login using BrowserID" /></a> |