[Mpuls-commits] r2821 - base/trunk/mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-05-31 12:02:36 +0200 (Mon, 31 May 2010)
New Revision: 2821

Modified:
   base/trunk/mpulsweb/lib/app_globals.py
Log:
* mpulsweb/lib/app_globals.py (Globals.__init__): Load tagging from base if there is no configuration specific tagging.



Modified: base/trunk/mpulsweb/lib/app_globals.py
===================================================================
--- base/trunk/mpulsweb/lib/app_globals.py	2010-05-31 10:02:19 UTC (rev 2820)
+++ base/trunk/mpulsweb/lib/app_globals.py	2010-05-31 10:02:36 UTC (rev 2821)
@@ -65,6 +65,9 @@
         if not os.path.isabs(mapping_file):
             root = config.get('pylons.paths').get('root')
             mapping_file = os.path.join(root, '..', mapping_file)
+        if not os.path.isabs(tagging_file):
+            root = config.get('pylons.paths').get('root')
+            tagging_file = os.path.join(root, '..', tagging_file)
 
         self.config_path = os.path.dirname(config_file)
         self.mpuls_config = MpulsAppConfig(config_file)