Revert accidental changes.

See #905
 - Legacy-Id: 5072
This commit is contained in:
Emilio Jiménez 2012-11-22 12:26:34 +00:00
parent 1b976ab6d1
commit 587681b9ba
2 changed files with 3 additions and 3 deletions

View file

@ -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),
)

View file

@ -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):