Changed so that SSO login is also redirected to the next URL

Author: hinashi

templates/registration/login.html

@@ -10,7 +10,7 @@
     <h2>Login</h2>
     {% if idp %}
     <br>
-    <a class="button" href="{% url 'social:begin' 'saml' %}?idp={{ idp }}">{{ sso_desc }}</a>
+    <a class="button" href="{% url 'social:begin' 'saml' %}?idp={{ idp }}&next={{ next }}">{{ sso_desc }}</a>
     <hr width="500" align="left">
     <br>
     {% endif %}
@@ -45,7 +45,8 @@ <h2>Login</h2>
           note_desc: "{{note_desc}}",
           note_link: "{{note_link}}",
           {% if idp %}
-          singleSignOnLoginUrl: "{% url 'social:begin' 'saml' %}?idp={{ idp }}",
+          singleSignOnLoginUrl: "{% url 'social:begin' 'saml' %}?idp={{ idp }}&next={{ next }}",
+          {% else %}
           {% endif %}
       };
     </script>