eryn/rogueojiiofwales
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Login and index view work.

Browse source 
Fix the docstrings.
Rename the pre_login_test view to just login. Functionality is still the same.
This commit is contained in:
Eryn Wells 2012-08-17 20:44:27 -07:00
parent 63de6467f6
commit b25eb12d7e
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
urls.py
View file

@ -11,6 +11,7 @@ admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^%s(?P<path>.*)$' % re.escape(settings.STATIC_URL.lstrip('/')), 'django.contrib.staticfiles.views.serve', {'insecure': True}), url(r'^%s(?P<path>.*)$' % re.escape(settings.STATIC_URL.lstrip('/')), 'django.contrib.staticfiles.views.serve', {'insecure': True}),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^login/', views.login, name='login'),
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
url(r'', include('social_auth.urls')), url(r'', include('social_auth.urls')),
) )

8
views.py
View file

@ -4,8 +4,8 @@ from django.shortcuts import redirect, render_to_response
def index(request): def index(request):
'''Index page. Everyone starts here. If the user is logged in (that is, they '''Index page. Everyone starts here. If the user is logged in (that is, they
have a session id) redirect them to the follower graph view. Otherwise, have a session id) return the follower_graph view. Otherwise, render the
render the index page.''' index page.'''
if request.method == 'POST': if request.method == 'POST':
request.session.set_test_cookie() request.session.set_test_cookie()
return redirect('login') return redirect('login')
@ -14,7 +14,9 @@ def index(request):
return render_to_response('login.html') return render_to_response('login.html')
def pre_login_test(request): def login(request):
'''Do a quick check to make sure cookies are enabled. If so, redirect to
GitHub so the user can login.'''
if request.session.test_cookie_worked(): if request.session.test_cookie_worked():
request.session.delete_test_cookie() request.session.delete_test_cookie()
return redirect('/login/github/') return redirect('/login/github/')