From 7eef61bd9035caf13663d6c7b078b53dcee25d98 Mon Sep 17 00:00:00 2001
From: Tasos Katsoulas <akatsoulas@gmail.com>
Date: Thu, 1 Dec 2016 13:46:29 +0200
Subject: [PATCH] Fix `next' redirection url.

---
 remo/base/templates/base_fd4.jinja | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/remo/base/templates/base_fd4.jinja b/remo/base/templates/base_fd4.jinja
index 4455111c7..ea01bfaa2 100644
--- a/remo/base/templates/base_fd4.jinja
+++ b/remo/base/templates/base_fd4.jinja
@@ -84,10 +84,10 @@
               <div class="account anonymous nomenu logout">
                 {% if not user.is_authenticated() %}
                   {% if request.get_full_path() != '/' %}
-                    {% set next=request.get_full_path() %}
+                    {% set next_url=request.REQUEST.next %}
                   {% endif %}
                   <span id="login-menu-locator">
-                    <a href="{{ url('oidc_authentication_init') }}">
+                    <a href="{{ url('oidc_authentication_init') }}?next={{ next_url }}">
                       Login
                     </a>
                   </span>