Mercurial > piecrust2

diff piecrust/admin/views/__init__.py @ 935:7ecb946bfafd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
admin: Lots of fixes for running the admin panel in a WSGI server. - Use new source APIs in the dashboard to open WIP files. - Fixed broken/outdated code in some views. - Fixed cases when Flask is not running at the root URL by using the `SCRIPT_NAME` variable somewhat more properly.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 04 Oct 2017 09:15:16 -0700
parents 5b4c02ed9bb2
children b1a00c2c0c7f
line wrap: on
line diff
--- a/piecrust/admin/views/__init__.py	Wed Oct 04 09:11:58 2017 -0700
+++ b/piecrust/admin/views/__init__.py	Wed Oct 04 09:15:16 2017 -0700
@@ -1,4 +1,4 @@
-from flask import render_template, current_app
+from flask import current_app, render_template, request
 from flask.views import View
 from .menu import get_menu_context
 
@@ -31,4 +31,7 @@
 def with_base_data(context=None):
     if context is None:
         context = {}
-    context['base_url'] = current_app.config['FOODTRUCK_URL_PREFIX']
+
+    script_root = request.script_root or ''
+    root_url = current_app.config.get('FOODTRUCK_ROOT_URL') or ''
+    context['base_url'] = script_root + root_url