diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-05-13 21:33:39 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-05-13 21:33:39 +0200 |
| commit | 7980ba22221c93330d4f09d5688f6ce5b113760f (patch) | |
| tree | 15506d04ce3c1d2502df73ddcb1ab38371bbb656 | |
| parent | dfd3b9881900d2e99374c66b8f4d19abf0d9b6f8 (diff) | |
send to next after login
| -rw-r--r-- | src/meetingtools/apps/auth/views.py | 2 | ||||
| -rw-r--r-- | src/templates/apps/room/launch.html | 2 |
2 files changed, 3 insertions, 1 deletions
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> |