Mercurial > piecrust2

comparison piecrust/serving/wrappers.py @ 1109:6f26e83dfced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
admin: Fix another root URL issue for the admin panel.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 18 Feb 2018 20:33:04 -0800
parents 137c9b41edd2
children e8511fed42a3
comparison
equal deleted inserted replaced
1108:b2a34a6ec5e5 1109:6f26e83dfced
160 160
161 def _get_piecrust_server(appfactory, *, 161 def _get_piecrust_server(appfactory, *,
162 serve_site=True, 162 serve_site=True,
163 serve_admin=False, 163 serve_admin=False,
164 is_cmdline_mode=False, 164 is_cmdline_mode=False,
165 admin_root_url=None,
166 run_sse_check=None): 165 run_sse_check=None):
167 app = None 166 app = None
168 167
169 if serve_site: 168 if serve_site:
170 from piecrust.serving.middlewares import ( 169 from piecrust.serving.middlewares import (
179 app, appfactory, run_sse_check=run_sse_check) 178 app, appfactory, run_sse_check=run_sse_check)
180 179
181 if serve_admin: 180 if serve_admin:
182 from piecrust.admin.web import create_foodtruck_app 181 from piecrust.admin.web import create_foodtruck_app
183 182
184 admin_root_url = admin_root_url or '/pc-admin' 183 admin_root_url = ('/pc-admin' if is_cmdline_mode else None)
185 184
186 es = { 185 es = {
187 'FOODTRUCK_CMDLINE_MODE': is_cmdline_mode, 186 'FOODTRUCK_CMDLINE_MODE': is_cmdline_mode,
188 'FOODTRUCK_ROOT_DIR': appfactory.root_dir, 187 'FOODTRUCK_ROOT_DIR': appfactory.root_dir,
189 'FOODTRUCK_ROOT_URL': admin_root_url, 188 'FOODTRUCK_ROOT_URL': admin_root_url,