Changeset 1450 for trunk/pylucid/PyLucid/plugins_internal/plugin_admin/plugin_admin.py

Timestamp:

02/27/08 19:34:49 (9 months ago)

Author:

JensDiemer

Message:

-remove all "internal page" stuff.
-add in the _install section update: DROP TABLE PyLucid_pagesinternal.

Files:

• trunk/pylucid/PyLucid/plugins_internal/plugin_admin/plugin_admin.py (modified) (6 diffs)

trunk/pylucid/PyLucid/plugins_internal/plugin_admin/plugin_admin.py

@@ -29 +29 @@
 from django.conf import settings
 
-from PyLucid.models import Plugin, PagesInternal
+from PyLucid.models import Plugin
 from PyLucid.system.plugin_manager import get_plugin_list, get_plugin_config, \
                                                                 install_plugin
@@ -95 +95 @@
         active_plugins = []
         deactive_plugins = []
-        installed_plugins = Plugin.objects.all()
+        installed_plugins = Plugin.objects.all().order_by(
+            'package_name', 'plugin_name'
+        )
         for plugin in installed_plugins:
             installed_names.append(plugin.plugin_name)
@@ -154 +156 @@
     # The real action methods
 
-    def _get_internal_page_info(self, plugin_obj):
-        pages = PagesInternal.objects.filter(plugin=plugin_obj)
-        page_names = [page.name.split(".",1)[-1] for page in pages]
-        return pages, page_names
-
     def _install_plugin(self, plugin_name, package_name, active=False):
         """
@@ -173 +170 @@
             raise ActionError(_("Error installing Plugin:"), e)
         else:
-            plugin = Plugin.objects.get(plugin_name=plugin_name)
-            pages, page_names = self._get_internal_page_info(plugin)
-            self.page_msg.green(
-                _("Plugin '%s' and internal pages %s saved into"
-                " the database.") % (plugin, page_names)
+            self.page_msg.green(
+                _("Plugin '%s' saved into the database.") % plugin_name
             )
 
@@ -189 +183 @@
                 self.page_msg.red("Can't deinstall the plugin. It's locked.")
                 return
-            pages, page_names = self._get_internal_page_info(plugin)
-            pages.delete()
             plugin.delete()
         except Exception, e:
@@ -198 +190 @@
         else:
             self.page_msg.green(
-                _("Plugin '%s' and internal pages %s removed from the"
-                " database.") % (plugin, page_names)
+                _("Plugin '%s' removed from the database.") % plugin
             )