Commit d93223f0 authored by PkSM3's avatar PkSM3

[UPDATE] login redirection OK

parent 83ac3219
...@@ -18,6 +18,7 @@ urlpatterns = patterns('', ...@@ -18,6 +18,7 @@ urlpatterns = patterns('',
url(r'^grappelli/', include('grappelli.urls')), url(r'^grappelli/', include('grappelli.urls')),
url(r'^auth/$', views.login_user), url(r'^auth/$', views.login_user),
url(r'^auth/logout/$', views.logout_user),
# User Home view # User Home view
url(r'^$', views.home), url(r'^$', views.home),
......
...@@ -51,6 +51,10 @@ def login_user(request): ...@@ -51,6 +51,10 @@ def login_user(request):
return render_to_response('authentication.html', context_instance=RequestContext(request)) return render_to_response('authentication.html', context_instance=RequestContext(request))
def logout_user(request):
logout(request)
return HttpResponseRedirect('/')
# Redirect to a success page.
def query_to_dicts(query_string, *query_args): def query_to_dicts(query_string, *query_args):
"""Run a simple query and produce a generator """Run a simple query and produce a generator
...@@ -117,7 +121,7 @@ def projects(request): ...@@ -117,7 +121,7 @@ def projects(request):
To each project, we can link a resource that can be an image. To each project, we can link a resource that can be an image.
''' '''
if not request.user.is_authenticated(): if not request.user.is_authenticated():
return redirect('/admin/logout/?next=%s' % request.path) return redirect('/auth/')
t = get_template('projects.html') t = get_template('projects.html')
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<script type="text/javascript"> <script type="text/javascript">
(function($) { (function($) {
$(window).load(function(){ $('#id_username').focus(); }); $(window).load(function(){ $('#username').focus(); });
})(grp.jQuery); })(grp.jQuery);
</script> </script>
</body> </body>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<li><a tabindex="-1" href="/auth/">Login</a></li> <li><a tabindex="-1" href="/auth/">Login</a></li>
<li><a tabindex="-1" href="#">Profile</a></li> <li><a tabindex="-1" href="#">Profile</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a tabindex="-1" href="#">Help</a></li> <li><a tabindex="-1" href="/auth/logout">Logout</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment