Display title from settings

diff --git a/src/pgwui_logout/__init__.py b/src/pgwui_logout/__init__.py
index b97e73067d3e44c7001766884c532c914de5246e..ef06bd3236d45aabb5a059c68308a3eafa9069e3 100644 (file)
--- a/src/pgwui_logout/__init__.py
+++ b/src/pgwui_logout/__init__.py
@@ -24,10 +24,22 @@
 
 PGWUI_COMPONENT = 'pgwui_logout'
 DEFAULT_LOGOUT_ROUTE = '/logout'
+DEFAULT_LOGOUT_MENU_LABEL = 'logout -- Logout from PGWUI programs'
+
+
+def init_menu(config):
+    '''Add default menu information into settings when they are not present
+    '''
+    settings = config.get_settings()
+    pgwui = settings.setdefault('pgwui', dict())
+    pgwui.setdefault(PGWUI_COMPONENT, dict())
+    pgwui[PGWUI_COMPONENT].setdefault(
+        'menu_label', DEFAULT_LOGOUT_MENU_LABEL)
 
 
 def includeme(config):
     '''Pyramid configuration for PGWUI_Logout
     '''
+    init_menu(config)
     config.add_route(PGWUI_COMPONENT, DEFAULT_LOGOUT_ROUTE)
     config.scan()

diff --git a/src/pgwui_logout/templates/logout.mak b/src/pgwui_logout/templates/logout.mak
index 40b8b6ee802a7e920d6028277cd2fb9f15859b91..b4626a15d9b231ec755422b0e49a14375db07996 100644 (file)
--- a/src/pgwui_logout/templates/logout.mak
+++ b/src/pgwui_logout/templates/logout.mak
@@ -30,7 +30,7 @@
 
 <%inherit file="${base_mak}" />
 
-<%block name="title">logout -- Logout from PGWUI programs</%block>
+<%block name="title">${pgwui['pgwui_logout']['menu_label']}</%block>
 <%block name="meta_keywords">
   <meta name="keywords" content="gombemi logout" />
 </%block>

diff --git a/src/pgwui_logout/views/logout.py b/src/pgwui_logout/views/logout.py
index f732cdd84625e163a7c602fb7b0fb9e901428895..af8d2972a73ea5c48ae7e8be16869bfd0eadf1d4 100644 (file)
--- a/src/pgwui_logout/views/logout.py
+++ b/src/pgwui_logout/views/logout.py
@@ -32,10 +32,13 @@ from pyramid.view import view_config
 from pgwui_common import base_view
 
 
-@view_config(route_name='logout',
+@view_config(route_name='pgwui_logout',
              renderer='pgwui_logout:templates/logout.mak')
 @base_view
 def logout_view(request):
     '''Clear the session'''
+    settings = request.registry.settings
+    response = {'errors': [],
+                'pgwui': {'pgwui_logout': settings['pgwui']['pgwui_logout']}}
     request.session.delete()
-    return {'errors': []}
+    return response

diff --git a/tests/views/test_logout.py b/tests/views/test_logout.py
index c0d5eb5e82d1388e004896cbf141bd04f19e4034..053a8fc78e4ab3de01d21b95c3a2b112eb2492df 100644 (file)
--- a/tests/views/test_logout.py
+++ b/tests/views/test_logout.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 The Meme Factory, Inc.  http://www.meme.com/
+# Copyright (C) 2018, 2020 The Meme Factory, Inc.  http://www.karlpinc.com/
 
 # This file is part of PGWUI_Logout.
 #
@@ -17,7 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-# Karl O. Pinc <kop@meme.com>
+# Karl O. Pinc <kop@karlpinc.com>
 
 from pyramid.testing import DummyRequest
 
@@ -46,6 +46,7 @@ def test_logout_view(pyramid_config):
     session = MockSession()
     request = DummyRequest()
     request.session = session
+    request.registry.settings['pgwui'] = {'pgwui_logout': None}
     includeme(pyramid_config)
     result = logout.logout_view(request)
     del result['pgwui']  # Remove variables added by pgwui view decorators