Changeset 2505

Timestamp:

01/27/10 16:36:36 (7 weeks ago)

Author:

JensDiemer

Message:

form_generator: handle "max_length" and "min_length" and don't add defaults

Files:

• branches/0.9/pylucid_project/pylucid_plugins/internals/admin_views.py (modified) (3 diffs)

branches/0.9/pylucid_project/pylucid_plugins/internals/admin_views.py

@@ -121 +121 @@
 #-----------------------------------------------------------------------------
 
-def textform_for_model(model):
+def _textform_for_model(model, request, debug=False):
     """
     based on http://www.djangosnippets.org/snippets/458/
     """
+    defaults = {"required": True, "initial": None, "min_length": None}
+
     opts = model._meta
     field_list = []
@@ -133 +135 @@
         if formfield:
             kw = []
-            for a in  ('queryset', 'maxlength', 'label', 'initial', 'help_text', 'required'):
+            if debug:
+                request.page_msg(dir(formfield))
+            for a in ('queryset', 'max_length', 'min_length', 'label', 'initial', 'help_text', 'required'):
                 if hasattr(formfield, a):
                     attr = getattr(formfield, a)
+
+                    if a in defaults and attr == defaults[a]:
+                        # Don't add default key/value combinations into form
+                        continue
+
                     if a in ("label", "help_text"): # "translate" lazy text
                         attr = unicode(attr)
 
-                    if attr in [True, False, None]:
-                        if a == 'required' and attr == True: # Don't add default
-                            continue
-                        if a == 'initial' and attr == None: # Don't add default
-                            continue
+                    if a == 'queryset':
+                        kw.append("%s=%s" % (a, "%s.objects.all()" % attr.model.__name__))
+                    elif attr in [True, False, None]:
                         kw.append("%s=%s" % (a, attr))
-                    elif a == 'queryset':
-                        kw.append("%s=%s" % (a, "%s.objects.all()" % attr.model.__name__))
                     elif attr:
                         kw.append("%s=_('%s')" % (a, attr))
@@ -169 +174 @@
     if model_no:
         model = models_dict[int(model_no)]
-        sourcecode = textform_for_model(model)
+        sourcecode = _textform_for_model(model, request, debug=True)
 
         output = hightlighter.make_html(sourcecode, source_type="py")