Changeset 512:c54bfe545bf7

Timestamp:

10/25/08 15:48:39 (3 months ago)

Author:

EnTeQuAk

Branch:

default

Message:

hopefully fixed some plugin issues

Files:

• zine/views/admin.py (modified) (3 diffs)

zine/views/admin.py

@@ -39 +39 @@
      touch_upload_folder, upload_file, create_thumbnail, file_exists, \
      get_filename
-from zine.utils.http import redirect_back, redirect_to
+from zine.utils.http import redirect_back, redirect_to, redirect
 from zine.i18n import parse_datetime, format_system_datetime, \
      list_timezones, has_timezone, list_languages, has_language
@@ -155 +155 @@
     # check for broken plugins if we have the plugin guard enabled
     if request.app.cfg['plugin_guard']:
+        plugins_to_deactivate = []
         for plugin in request.app.plugins.itervalues():
             if plugin.active and plugin.setup_error is not None:
-                plugin.deactivate()
+                plugins_to_deactivate.append(plugin.name)
                 exc_type, exc_value, tb = plugin.setup_error
                 if exc_type is SetupError:
@@ -177 +178 @@
                     }
                 flash(msg, 'error')
+
+        if plugins_to_deactivate:
+            #TODO: it's quite tricky – it needs at least two reloads to
+            #      deactivate the plugin (which is in fact a application reload)
+            cfg = request.app.cfg.edit()
+            cfg['plugins'] = u', '.join(sorted(set(request.app.cfg['plugins']) - \
+                                               set(plugins_to_deactivate)))
+            cfg.commit()
+            # we change the plugins inline so that the user get somewhat more
+            # informations
+            request.app.cfg.touch()
+
 
     #! used to flash messages, add links to stylesheets, modify the admin