From 587681b9ba4dac77bd853c0a0735d6d6ba5680ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= <jimenezmoral@gmail.com>
Date: Thu, 22 Nov 2012 12:26:34 +0000
Subject: [PATCH] Revert accidental changes.

See #905
 - Legacy-Id: 5072
---
 ietf/ietfauth/urls.py  | 4 ++--
 ietf/ietfauth/views.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ietf/ietfauth/urls.py b/ietf/ietfauth/urls.py
index 88000cf20..c96e3fad0 100644
--- a/ietf/ietfauth/urls.py
+++ b/ietf/ietfauth/urls.py
@@ -5,10 +5,10 @@ from ietf.ietfauth import views
 
 urlpatterns = patterns('',
         (r'^$', views.index, None, 'account_index'),
-#        (r'^login/$', views.ietf_login),
+        (r'^login/$', views.ietf_login),
         (r'^loggedin/$', views.ietf_loggedin),
 	(r'^profile/$', views.profile),
-        (r'^login/(?P<user>[a-z0-9.@]+)/(?P<passwd>.+)$', views.url_login),
+#        (r'^login/(?P<user>[a-z0-9.@]+)/(?P<passwd>.+)$', views.url_login),
 	(r'^testemail/$', views.test_email),
 )
 
diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py
index 2827916cf..8b147fc75 100644
--- a/ietf/ietfauth/views.py
+++ b/ietf/ietfauth/views.py
@@ -57,7 +57,7 @@ def url_login(request, user, passwd):
     if user is not None:
         if user.is_active:
             login(request, user)
-            return HttpResponseRedirect('/admin')
+            return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to)))
     return HttpResponse("Not authenticated?", status=500)
 
 def ietf_login(request):