changeset 920:5b4c02ed9bb2

serve: Fix error admin panel error message page.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 29 Sep 2017 08:45:06 -0700
parents 725744a4c42d
children 628d639bb30b
files piecrust/admin/views/__init__.py piecrust/admin/views/publish.py
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/piecrust/admin/views/__init__.py	Fri Sep 29 08:44:21 2017 -0700
+++ b/piecrust/admin/views/__init__.py	Fri Sep 29 08:45:06 2017 -0700
@@ -24,6 +24,11 @@
     if context is None:
         context = {}
     context['menu'] = get_menu_context()
-    context['base_url'] = current_app.config['FOODTRUCK_URL_PREFIX']
+    with_base_data(context)
     return context
 
+
+def with_base_data(context=None):
+    if context is None:
+        context = {}
+    context['base_url'] = current_app.config['FOODTRUCK_URL_PREFIX']
--- a/piecrust/admin/views/publish.py	Fri Sep 29 08:44:21 2017 -0700
+++ b/piecrust/admin/views/publish.py	Fri Sep 29 08:45:06 2017 -0700
@@ -4,7 +4,7 @@
 from flask.ext.login import login_required
 from ..blueprint import foodtruck_bp
 from ..pubutil import PublishLogReader
-from ..views import with_menu_context
+from ..views import with_menu_context, with_base_data
 
 
 logger = logging.getLogger(__name__)
@@ -25,6 +25,7 @@
     if not pub_cfg:
         data = {'error': "There are no publish targets defined in your "
                          "configuration file."}
+        with_base_data(data)
         return render_template('error.html', **data)
 
     data = {}