Fixing merge

ckan · Sep 14, 2012 · 3adc136 · 3adc136
2 parents 5fa94a2 + c3db69f
commit 3adc136
Show file tree

Hide file tree

Showing 49 changed files with 3,904 additions and 2,247 deletions.
diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
@@ -69,7 +69,7 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     #app = QueueLogMiddleware(app)
 
     # Fanstatic
-    if config.get('ckan.include_support', '').lower()[:3] == 'dev':
+    if asbool(config.get('debug', False)):
         fanstatic_config = {
             'versioning' : True,
             'recompute_hashes' : True,

diff --git a/ckan/html_resources/.gitignore b/ckan/html_resources/.gitignore
diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py
@@ -70,7 +70,10 @@ def get_globals_key(key):
 def reset():
     ''' set updatable values from config '''
     def get_config_value(key, default=''):
-        value = model.get_system_info(key)
+        if model.meta.engine.has_table('system_info'):
+            value = model.get_system_info(key)
+        else:
+            value = None
         # we want to store the config the first time we get here so we can
         # reset them if needed
         config_value = config.get(key)