Mercurial > kallithea
changeset 309:7e4771a0ff43
added base path into config
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 29 Jun 2010 12:24:25 +0200 |
| parents | 19944fc4f872 |
| children | fc4027fe46bc |
| files | pylons_app/config/environment.py pylons_app/config/middleware.py |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/config/environment.py Mon Jun 28 23:31:03 2010 +0200 +++ b/pylons_app/config/environment.py Tue Jun 29 12:24:25 2010 +0200 @@ -3,7 +3,7 @@ from pylons.configuration import PylonsConfig from pylons.error import handle_mako_error from pylons_app.config.routing import make_map -from pylons_app.lib.auth import set_available_permissions +from pylons_app.lib.auth import set_available_permissions, set_base_path from pylons_app.lib.utils import repo2db_mapper from pylons_app.model import init_model from pylons_app.model.hg_model import _get_repos_cached_initial @@ -63,7 +63,7 @@ init_model(sa_engine_db1) repo2db_mapper(_get_repos_cached_initial(config['pylons.app_globals'])) set_available_permissions(config) - config['base_path'] = config['pylons.app_globals'].base_path + set_base_path(config) # CONFIGURATION OPTIONS HERE (note: all config options will override # any Pylons config options)
--- a/pylons_app/config/middleware.py Mon Jun 28 23:31:03 2010 +0200 +++ b/pylons_app/config/middleware.py Tue Jun 29 12:24:25 2010 +0200 @@ -33,10 +33,8 @@ # Configure the Pylons environment config = load_environment(global_conf, app_conf) - # The Pylons WSGI app app = PylonsApp(config=config) - # Routing/Session/Cache Middleware app = RoutesMiddleware(app, config['routes.map'])