Changeset 1548 for trunk/pylucid/PyLucid/plugins_internal/preferences/preferences.py

Timestamp:

05/01/08 12:24:21 (23 months ago)

Author:

JensDiemer

Message:

put the plugin preferences into the plugin model.
TODO: update detect_page and set system_settings at install.

Files:

• trunk/pylucid/PyLucid/plugins_internal/preferences/preferences.py (modified) (4 diffs)

trunk/pylucid/PyLucid/plugins_internal/preferences/preferences.py

@@ -26 +26 @@
 from django.utils.translation import ugettext as _
 
-from PyLucid.db.preferences import get_all_prefs, Preferences
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
-from PyLucid.tools.data_eval import data_eval, DataEvalError
+from PyLucid.models import Plugin
 
 
@@ -44 +43 @@
 
         items = []
-        for pref in get_all_prefs():
-            edit_link = self.URLs.methodLink("edit", args=pref.id)
+        plugins = Plugin.objects.all()
+        for plugin in plugins:
+            if plugin.pref_data_string == None:
+                continue
+
+            edit_link = self.URLs.methodLink("edit", args=plugin.id)
 
             items.append({
-                "plugin_name": self._vebose_plugin_name(pref),
-                "plugin_description": pref.plugin.description,
+                "plugin_name": unicode(plugin),
+                "plugin_description": plugin.description,
                 "edit_link": edit_link,
             })
@@ -62 +65 @@
         try:
             url_args = url_args.strip("/")
-            pref_id = int(url_args)
+            plugin_id = int(url_args)
         except Exception, e:
             self.page_msg.red("url error:", e)
             return
 
-        p = Preferences()
-        p.init_via_id(pref_id)
-        data_dict = p.data_dict
-
-        p.load_form(self.request)
-        unbound_form = p.form
+        plugin = Plugin.objects.get(id = plugin_id)
+        unbound_form = plugin.get_pref_form(self.request.debug)
 
         if self.request.method == 'POST':
@@ -78 +77 @@
             if form.is_valid():
                 new_data_dict = form.cleaned_data
-                p.update_and_save(new_data_dict)
+
+                plugin.set_pref_data_string(new_data_dict)
+                plugin.save()
                 self.page_msg("New preferences saved.")
                 return self.select() # Display the menu
         else:
+            data_dict = plugin.get_preferences()
             form = unbound_form(data_dict)
 
         context = {
-            "plugin_name": self._vebose_plugin_name(p),
+            "plugin_name": unicode(plugin),
             "form": form,
             "url_abort": self.URLs.methodLink("select"),