Merge "Fixes session timeout string in horizon"

2 files changed, 9 insertions, 6 deletions

diff --git a/horizon/utils/functions.py b/horizon/utils/functions.py
index 3d3836614..85802f53e 100644
--- a/horizon/utils/functions.py
+++ b/horizon/utils/functions.py
@@ -39,7 +39,7 @@ def add_logout_reason(request, response, reason):
     lang = translation.get_language_from_request(request)
     with translation.override(lang):
         reason = unicode(reason).encode('utf-8')
-        response.set_cookie('logout_reason', reason, max_age=30)
+        response.set_cookie('logout_reason', reason, max_age=10)
 
 
 def logout_with_message(request, msg):
diff --git a/openstack_dashboard/views.py b/openstack_dashboard/views.py
index a5e85c528..4ce55ffdc 100644
--- a/openstack_dashboard/views.py
+++ b/openstack_dashboard/views.py
@@ -38,8 +38,11 @@ def get_user_home(user):
 @django.views.decorators.vary.vary_on_cookie
 def splash(request):
     if request.user.is_authenticated():
-        return shortcuts.redirect(horizon.get_user_home(request.user))
-    form = forms.Login(request)
-    request.session.clear()
-    request.session.set_test_cookie()
-    return shortcuts.render(request, 'splash.html', {'form': form})
+        response = shortcuts.redirect(horizon.get_user_home(request.user))
+    else:
+        form = forms.Login(request)
+        request.session.clear()
+        request.session.set_test_cookie()
+        response = shortcuts.render(request, 'splash.html', {'form': form})
+    response.delete_cookie('logout_reason')
+    return response