Ticket #3295: groups_in_forms.patch

django/newforms/forms.py

@@ -31 +31 @@
     def __new__(cls, name, bases, attrs):
         fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
         fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
+        for field_name, obj in attrs.items():
+            if field_name.startswith('group_'):
+                name_func = field_name.replace('group_','')
+                new_class.add_to_class(name_func, obj)
+                delattr(new_class, field_name)
         attrs['fields'] = SortedDictFromList(fields)
         return type.__new__(cls, name, bases, attrs)
 
@@ -171 +176 @@
         association with the field named '__all__'.
         """
         return self.clean_data
-
+    def _prepare_HTML_output(self, list_fileds, func_HTML):
+        oldfields  = self.fields.copy() # save original fields
+        data = []
+        for field in list_fileds:
+            if oldfields.has_key(field):
+                data.append( (field, oldfields[field]) )
+        self.fields = SortedDictFromList(data)
+        output = func_HTML() 
+        self.fields = oldfields # restore original fields
+        return output
+        
+    def add_to_class(cls, name, value):
+        setattr(cls, '%s_as_p' % name, lambda self: self._prepare_HTML_output( value, self.as_p ))
+        setattr(cls, '%s_as_table' % name, lambda self: self._prepare_HTML_output_HTML_output( value, self.as_table ))
+    add_to_class = classmethod(add_to_class)
 class Form(BaseForm):
     "A collection of Fields, plus their associated data."
     # This is a separate class from BaseForm in order to abstract the way