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

Timestamp:

04/30/08 13:35:20 (23 months ago)

Author:

JensDiemer

Message:

Experimental new Preferences!

• New editor used the newforms models in the plugin class
• Doesn't realy use the preferences (in search and find_and_replace) only display it
• the system_settings doesn't used, too. Only for display the data.
• Not ready in all cases
• there can exist some print debug!

Files:

• trunk/pylucid/PyLucid/plugins_internal/preferences/preferences.py (modified) (6 diffs, 2 props)

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

@@ -12 +12 @@
     $LastChangedDate$
     $Rev$
-    $Author: JensDiemer $
+    $Author$
 
     :copyleft: 2008 by the PyLucid team.
@@ -26 +26 @@
 from django.utils.translation import ugettext as _
 
-from PyLucid.models import Preference
+from PyLucid.db.preferences import get_all_prefs, Preferences
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 from PyLucid.tools.data_eval import data_eval, DataEvalError
-
-INTERNAL_NAME = "[system]"
-
-
-class DataEvalField(forms.CharField):
-    def clean(self, raw_value):
-        raw_value = super(DataEvalField, self).clean(raw_value)
-        try:
-            value = data_eval(raw_value)
-        except DataEvalError, e:
-            raise ValidationError(_(u"data eval error: %s") % e)
-        else:
-            return value
-
-class PformatWidget(forms.Textarea):
-    def __init__(self, attrs=None):
-        self.attrs={'rows': '10'}
-
-    def render(self, name, value, attrs=None):
-        if not isinstance(value, basestring):
-            value = pformat(value)
-        return super(PformatWidget, self).render(name, value, attrs=None)
-
-class EditForm(forms.Form):
-    """
-    Form for editing a preferences
-    """
-    raw_value = DataEvalField(widget=PformatWidget())
 
 
@@ -63 +35 @@
 
     def _vebose_plugin_name(self, pref):
-        if pref.plugin == None:
-            return INTERNAL_NAME
-        else:
-            return pref.plugin.plugin_name.replace("_", " ")
+        return pref.plugin.plugin_name.replace("_", " ")
 
     def select(self):
@@ -72 +41 @@
         Display the sub menu
         """
-        self.context["PAGE"].title = _("Low level preferences editor")
+        self.context["PAGE"].title = _("preferences editor")
 
-        preferences = {}
-        for pref in Preference.objects.all():
-            plugin_name = self._vebose_plugin_name(pref)
+        items = []
+        for pref in get_all_prefs():
+            edit_link = self.URLs.methodLink("edit", args=pref.id)
 
-            pref.link = self.URLs.methodLink("edit", args=(pref.id, pref.name))
-
-            if plugin_name not in preferences:
-                preferences[plugin_name] = [pref]
-            else:
-                preferences[plugin_name].append(pref)
+            items.append({
+                "plugin_name": self._vebose_plugin_name(pref),
+                "plugin_description": pref.plugin.description,
+                "edit_link": edit_link,
+            })
 
         context = {
-            "preferences": preferences,
+            "preferences": items,
+            "admin_link": self.URLs.adminLink("PyLucid/preference"),
         }
         self._render_template("select", context)#, debug=True)
 
-    def edit(self, url_args=None):
+    def edit(self, url_args):
         try:
-            url_args = url_args.strip("/").split("/",1)[0]
+            url_args = url_args.strip("/")
             pref_id = int(url_args)
         except Exception, e:
@@ -98 +67 @@
             return
 
-        p = Preference.objects.get(id = pref_id)
+        p = Preferences()
+        p.init_via_id(pref_id)
+        data_dict = p.data_dict
+
+        p.load_form(self.request)
+        unbound_form = p.form
 
         if self.request.method == 'POST':
-            form = EditForm(self.request.POST)
+            form = unbound_form(self.request.POST)
             if form.is_valid():
-                value = form.cleaned_data["raw_value"]
-                if "validate" in self.request.POST:
-                    # rebuild the form for pformat with the eval data
-                    form = EditForm({"raw_value": value})
-                    self.page_msg("validate only...")
-                else:
-                    # save the form
-                    p.value = value
-                    p.save()
-                    self.page_msg.green("new value saved!")
-                    return self.select() # Display the menu
+                new_data_dict = form.cleaned_data
+                p.update_and_save(new_data_dict)
+                self.page_msg("New preferences saved.")
+                return self.select() # Display the menu
         else:
-            form = EditForm({"raw_value": p.value})
+            form = unbound_form(data_dict)
 
         context = {
             "plugin_name": self._vebose_plugin_name(p),
-            "pref_name": p.name,
-            "description": p.description,
             "form": form,
             "url_abort": self.URLs.methodLink("select"),
         }
         self._render_template("edit_form", context)#, debug=True)
-#        self._render_string_template(EDIT_TEMPLATE, context)#, debug=True)
 
 
@@ -133 +97 @@
 
 
-
-
-
-
-
-
-
-