From 7980ba22221c93330d4f09d5688f6ce5b113760f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 13 May 2011 21:33:39 +0200
Subject: send to next after login

---
 src/meetingtools/apps/auth/views.py | 2 ++
 src/templates/apps/room/launch.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/meetingtools/apps/auth/views.py b/src/meetingtools/apps/auth/views.py
index cef309b..daeb09d 100644
--- a/src/meetingtools/apps/auth/views.py
+++ b/src/meetingtools/apps/auth/views.py
@@ -158,6 +158,8 @@ def accounts_login_federated(request):
         #        connect_api.add_remove_member(principal.get('principal-id'),group.get('principal-id'),True)
             
         next = request.session.get("after_login_redirect", None)
+        if not next and request.GET.has_key('next'):
+            next = request.GET['']
         if next is not None:
             return redirect_to(next)
     else:
diff --git a/src/templates/apps/room/launch.html b/src/templates/apps/room/launch.html
index cc80ca6..970df96 100644
--- a/src/templates/apps/room/launch.html
+++ b/src/templates/apps/room/launch.html
@@ -21,7 +21,7 @@
 	<br/>
 	<ul class="ilist">
 	    {%if room.nusers == 0 %}
-		<li class="button"><a href="{% prefix %}/promote/{{room.id}}">Enter as Host</a></li>
+		<li class="button"><a href="{% prefix %}/accounts/login-federated?next={% prefix %}/promote/{{room.id}}">Enter as Host</a></li>
 		{% endif %}
 		<li class="button"><a href="{% prefix %}/launch/{{room.id}}">Enter</a></li>
 	</ul>
-- 
cgit v1.1