[#2302] Re-enable reset config options

ckan/controllers/admin.py

@@ -49,6 +49,10 @@ def config(self):
             app_globals.set_global('ckan.site_about', about)
 
         if 'reset' in data:
+            # remove sys info items
+            for key in app_globals.auto_update:
+                app_globals.delete_global(key)
+            app_globals.delete_global('ckan.main_css')
             # reset to values in config
             app_globals.reset()
 

ckan/lib/app_globals.py

@@ -25,6 +25,8 @@
     'ckan.site_about',
 ]
 
+# A place to store the origional config options of we override them
+_CONFIG_CACHE = {}
 
 def set_main_css(css_file):
     ''' Sets the main_css using debug css if needed.  The css_file
@@ -46,6 +48,10 @@ def set_global(key, value):
     config[key] = value
     log.info('config `%s` set to `%s`' % (key, value))
 
+def delete_global(key):
+    model.delete_system_info(key)
+    log.info('config `%s` deleted' % (key))
+
 def get_globals_key(key):
     # create our globals key
     # these can be specified in mappings or else we remove
@@ -58,15 +64,23 @@ def get_globals_key(key):
 
 def reset():
     ''' set updatable values from config '''
-
     def get_config_value(key, default=''):
         value = model.get_system_info(key)
+        # we want to store the config the first time we get here so we can
+        # reset them if needed
+        config_value = config.get(key)
+        if key not in _CONFIG_CACHE:
+            _CONFIG_CACHE[key] = config_value
         if value:
             # update the config
             config[key] = value
             log.info('config `%s` set to `%s` from db' % (key, value))
         else:
-            value = config.get(key, default)
+            value = _CONFIG_CACHE[key]
+            if value:
+                log.info('config `%s` set to `%s` from config' % (key, value))
+            else:
+                value = default
         setattr(app_globals, get_globals_key(key), value)
         return value
 

ckan/model/__init__.py

@@ -152,6 +152,7 @@
     SystemInfo,
     get_system_info,
     set_system_info,
+    delete_system_info,
 )
 
 import ckan.migration

ckan/model/system_info.py

@@ -35,6 +35,16 @@ def get_system_info(key, default=None):
         return default
 
 
+def delete_system_info(key, default=None):
+    ''' delete data from system_info table '''
+    obj = meta.Session.query(SystemInfo).filter_by(key=key).first()
+    print key
+    if obj:
+        print obj
+        meta.Session.delete(obj)
+        meta.Session.commit()
+
+
 def set_system_info(key, value):
     ''' save data in the system_info table '''