kallithea Changeset - 7e4771a0ff43

Changeset - 7e4771a0ff43

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-06-29 12:24:25
marcin@python-works.com

added base path into config

2 files changed with 2 insertions and 4 deletions:

pylons_app/config/environment.py

pylons_app/config/middleware.py

0 comments (0 inline, 0 general)

pylons_app/config/environment.py

➞

Show inline comments

 """Pylons environment configuration"""
 from mako.lookup import TemplateLookup
 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
 from sqlalchemy import engine_from_config
 import logging
 import os
@@ @@ -60,11 +60,11 @@ def load_environment(global_conf, app_co @@
     else:
         sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
     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)
     return config

pylons_app/config/middleware.py

➞

Show inline comments

@@ @@ -30,17 +30,15 @@ def make_app(global_conf, full_stack=Tru @@
         defaults to main).
     """
     # 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'])
     app = SessionMiddleware(app, config)
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
     #set the https based on HTTP_X_URL_SCHEME

0 comments (0 inline, 0 general)