[Mpuls-commits] r1261 - wasko/branches/2.0/mpulsweb/config

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-05 09:32:19 +0100 (Fri, 05 Feb 2010)
New Revision: 1261

Modified:
   wasko/branches/2.0/mpulsweb/config/environment.py
Log:
* mpulsweb/config/environment.py (load_environment): use
mpuls.app.path.controllers var to configure location of controllers.



Modified: wasko/branches/2.0/mpulsweb/config/environment.py
===================================================================
--- wasko/branches/2.0/mpulsweb/config/environment.py	2010-02-05 08:18:38 UTC (rev 1260)
+++ wasko/branches/2.0/mpulsweb/config/environment.py	2010-02-05 08:32:19 UTC (rev 1261)
@@ -40,7 +40,6 @@
     """Configure the Pylons environment via the ``pylons.config`` object"""
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    future_root = os.path.join(global_conf.get('mpuls.app.root'), 'mpulsweb')
 
     # Templates
     template_urls = []
@@ -57,7 +56,7 @@
         log.info('Custom "public" directory: %s' % static_url)
 
     paths = dict(root=root,
-                 controllers=os.path.join(future_root, 'controllers'),
+                 controllers=global_conf.get('mpuls.app.path.controllers'),
                  static_files=static_url,
                  templates=template_urls)