diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-10 21:42:14 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-12 14:59:07 +0300 |
| commit | 83e3932c835c32d921dca90496d920fb8036793c (patch) | |
| tree | c4f7ee771d6c40069c6de698bae3589b93bcb925 /src/server | |
| parent | ec2899a0df9eaf57af8281dd589a5fc26e0bbe6c (diff) | |
rz_server: use template_d_relpath, not template_d_path for template_folder
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rz_server.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 3120fc28..6911322d 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -253,10 +253,17 @@ def init_webapp(cfg, kernel): # # init webapp # + + # due to magic in os.path.join: os.path.join('/a', '/b') -> '/b', + # we pass a non-absolute template_d path, even though it is configured as such + template_d_relpath = cfg.template_d_path + if template_d_relpath.startswith('/'): template_d_relpath = template_d_relpath[1:] + webapp = FlaskExt(__name__, static_folder='static', static_url_path=cfg.static_url_path, - template_folder=cfg.template_d_relpath) + template_folder=template_d_relpath) + webapp.config.from_object(cfg) webapp.root_path = root_path # for some reason calling config.from_xxx() does not have effect webapp.rz_config = cfg |
