Changeset 1640

Timestamp:

06/13/08 19:18:23 (21 months ago)

Author:

JensDiemer

Message:

bugfix/update for new plugin manager api

Location:

trunk/pylucid/PyLucid

Files:

• install/install.py (modified) (2 diffs)
• system/plugin_manager.py (modified) (2 diffs)
• templates_PyLucid/install_base.html (modified) (1 diff)

trunk/pylucid/PyLucid/install/install.py

@@ -31 +31 @@
     DROP_TABLES = (
 #        "PyLucid_pagearchiv",
-#        "PyLucid_plugin",
+        "PyLucid_plugin",
         "PyLucid_preference",
         "PyLucid_preference2",
@@ -121 +121 @@
 install_modules_template = """
 {% extends "install_base.html" %}
-{% block content %}
+{% block pre_page_msg_content %}
 <h1>Install all internal plugins:</h1>
-<pre>{{ output|escape }}</pre>
 {% endblock %}
 """
 class InstallPlugins(BaseInstall):
     def view(self):
-        output = []
         from PyLucid.system.plugin_manager import auto_install_plugins
 
-        self._redirect_execute(auto_install_plugins, (self.request.debug))
+        auto_install_plugins(
+            self.request.debug, self.page_msg, verbosity = 1
+        )
 
         return self._render(install_modules_template)

trunk/pylucid/PyLucid/system/plugin_manager.py

@@ -303 +303 @@
 
     for plugin_name in plugin_list:
-        if verbosity>1:
+        if verbosity:
             msg= "\n\ninstall '%s' plugin: *** %s ***\n" % (
                 path_cfg["type"], plugin_name
             )
-            page_msg(msg)
+            page_msg.black(msg)
 
         try:
-            install_plugin(
+            plugin = install_plugin(
                 package_name, plugin_name, page_msg, verbosity, active=True
             )
@@ -320 +320 @@
             continue
 
-        if verbosity>1:
-            page_msg("OK, plugins installed.")
-
-
-
-
-
-
-
+        if verbosity:
+            page_msg.green("OK, plugin ID %s installed." % plugin.id)
+
+
+
+
+
+
+

trunk/pylucid/PyLucid/templates_PyLucid/install_base.html

@@ -29 +29 @@
 <h3 class="header"><a href="http://www.pylucid.org">PyLucid</a> v{{ version }} - setup@<a href="/" title="{% trans 'goto your PyLucid CMS page' %}">{{ request.META.HTTP_HOST }}</a></h3>
 {% if not no_menu_link %}<p><a href="{% url PyLucid.install.index.menu . %}">&#xAB; {% trans 'back to menu' %}</a></p>{% endif %}
+{% block pre_page_msg_content %}{% endblock %}
 <!-- page_messages -->