From 117dfd779f97cb034d8004f3d6b84e9d2deb25c7 Mon Sep 17 00:00:00 2001
From: Michael Elkins <melkins@tislabs.com>
Date: Tue, 6 Jul 2010 21:24:13 +0000
Subject: redirect to /myrpki/ on logout

svn path=/portal-gui/rpkigui/settings.py; revision=3352
---
 portal-gui/rpkigui/settings.py |  3 +--
 portal-gui/rpkigui/urls.py     | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'portal-gui/rpkigui')

diff --git a/portal-gui/rpkigui/settings.py b/portal-gui/rpkigui/settings.py
index 1c7d073e..d4e662dd 100644
--- a/portal-gui/rpkigui/settings.py
+++ b/portal-gui/rpkigui/settings.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Django settings for rpki project.
+# Django settings for rpkigui project.
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -85,7 +85,6 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'rpkigui.myrpki',
-#    'rpki.django_extensions',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/portal-gui/rpkigui/urls.py b/portal-gui/rpkigui/urls.py
index dddb6a0a..09d71e00 100644
--- a/portal-gui/rpkigui/urls.py
+++ b/portal-gui/rpkigui/urls.py
@@ -1,3 +1,5 @@
+# $Id$
+
 from django.conf.urls.defaults import *
 
 from django.contrib import admin
@@ -14,15 +16,13 @@ urlpatterns = patterns('',
     # Uncomment the next line to enable the admin:
     (r'^admin/', include(admin.site.urls)),
 
-    #(r'^dashboard/', include('myrpki.dashboardurls')),
     (r'^myrpki/', include('rpkigui.myrpki.urls')),
 
     (r'^accounts/login/$', 'django.contrib.auth.views.login'),
-    (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
+    (r'^accounts/logout/$', 'django.contrib.auth.views.logout',
+        { 'next_page': '/myrpki/' }),
 
 #XXX
 (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
-        #{'document_root': '/Users/fenner/src/portal-gui/media/'}),
-        {'document_root': '/home/melkins/src/rpki/portal-gui/media/'}),
-
+        {'document_root': '/home/melkins/src/rpki/portal-gui/media/'})
 )
-- 
cgit v1.2.3