diff piecrust/admin/views/preview.py @ 886:dcdec4b951a1

admin: Get the admin panel working again.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 20 Jun 2017 21:13:08 -0700
parents 82509bce94ca
children 725744a4c42d
line wrap: on
line diff
--- a/piecrust/admin/views/preview.py	Tue Jun 20 21:12:35 2017 -0700
+++ b/piecrust/admin/views/preview.py	Tue Jun 20 21:13:08 2017 -0700
@@ -1,25 +1,21 @@
 from flask import current_app, g, make_response
 from flask.ext.login import login_required
-from piecrust.app import PieCrustFactory
 from piecrust.serving.server import Server
 from ..blueprint import foodtruck_bp
 
 
-@foodtruck_bp.route('/site/<sitename>/')
+@foodtruck_bp.route('/preview/')
 @login_required
-def preview_site_root(sitename):
-    return preview_site(sitename, '/')
+def preview_root_page():
+    return preview_page('/')
 
 
-@foodtruck_bp.route('/site/<sitename>/<path:url>')
+@foodtruck_bp.route('/preview/<path:url>')
 @login_required
-def preview_site(sitename, url):
-    root_dir = g.sites.get_root_dir(sitename)
-    appfactory = PieCrustFactory(
-        root_dir,
-        cache_key='foodtruck',
-        debug=current_app.debug)
-    server = Server(appfactory,
-                    root_url='/site/%s/' % sitename)
+def preview_page(url):
+    pcappfac = g.site.piecrust_factory
+    url_prefix = current_app.config['FOODTRUCK_URL_PREFIX']
+    server = Server(pcappfac,
+                    root_url='%s/preview/' % url_prefix)
     return make_response(server._run_request)