From 304bdd87b1a93f376472c021675192659ffb88c2 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 10 Jan 2011 14:20:14 +0000 Subject: [PATCH] Switch index view to use a django generic standard view --- sso/urls.py | 7 ++++++- sso/views.py | 8 -------- templates/base.html | 1 - 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sso/urls.py b/sso/urls.py index 06f13ea..0d1d0f1 100644 --- a/sso/urls.py +++ b/sso/urls.py @@ -1,9 +1,10 @@ from django.conf.urls.defaults import * +from django.core.urlresolvers import reverse from sso import views urlpatterns = patterns('', - ('^$', views.index), + ('^$', views.profile), (r'^profile/$', views.profile), (r'^profile/add/eveapi', views.eveapi_add), (r'^profile/del/eveapi/$', views.eveapi_del), @@ -21,3 +22,7 @@ urlpatterns = patterns('', (r'^users/(?P.*)/$', views.user_view), (r'^users/$', views.user_lookup), ) + +urlpatterns += patterns('django.views.generic.simple', + ('^$', 'redirect_to', {'url': reverse('sso.views.profile')}), +) diff --git a/sso/views.py b/sso/views.py index 7ec9f8c..1c638e8 100644 --- a/sso/views.py +++ b/sso/views.py @@ -24,14 +24,6 @@ from eve_proxy.models import ApiAccessLog from sso.models import ServiceAccount, Service, SSOUser, ExistingUser, ServiceError from sso.forms import EveAPIForm, UserServiceAccountForm, ServiceAccountResetForm, UserLookupForm, APIPasswordForm - -def index(request): - if request.user: - return redirect('sso.views.profile') - else: - return render_to_response('sso/index.html', context_instance=RequestContext(request)) - - @login_required def profile(request): """ Displays the user's profile page """ diff --git a/templates/base.html b/templates/base.html index 2f29437..64dd033 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,6 @@