Changeset 4372

Timestamp:

01/20/07 15:16:31 (2 years ago)

Author:

adrian

Message:

newforms-admin: Made the first step in converting add and change forms to use newforms. Got rid of some overengineered admin template tags along the way.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (7 diffs)
• django/branches/newforms-admin/django/contrib/admin/templates/admin/change_form.html (modified) (3 diffs)
• django/branches/newforms-admin/django/contrib/admin/templates/admin/field_line.html (deleted)
• django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py (modified) (2 diffs)

django/branches/newforms-admin/django/contrib/admin/options.py

@@ -1 +1 @@
-from django import oldforms, template
+from django import newforms as forms
-from django.core.exceptions import ImproperlyConfigured, PermissionDenied
-from django.db import models
@@ -68 +69 @@
-        return len(self.fields)
-
-
+
+
+
+
+
+
+
+
-class Fieldset(object):
-    def __init__(self, name=None, fields=(), classes=(), description=None):
@@ -74 +82 @@
-        self.classes = ' '.join(classes)
-        self.description = description
+
+class BoundFieldset(object):
+    def __init__(self, form, fieldset):
+        self.form, self.fieldset = form, fieldset
+
+    def __iter__(self):
+        for field in self.fieldset.fields:
+            yield BoundFieldline(self.form, field)
+
+class BoundFieldline(object):
+    def __init__(self, form, field):
+        self.form = form # A django.forms.Form instance
+        if isinstance(field, basestring):
+            self.fields = [field]
+        else:
+            self.fields = field
+
+    def __iter__(self):
+        for i, field in enumerate(self.fields):
+            yield BoundField(self.form, field, is_first=(i == 0))
+
+    def errors(self):
+        return u'\n'.join([self.form[f].errors.as_ul() for f in self.fields])
+
+class BoundField(object):
+    def __init__(self, form, field, is_first):
+        self.field = form[field] # A django.forms.BoundField instance
+        self.is_first = is_first # Whether this field is first on the line
+        self.is_checkbox = isinstance(self.field.field.widget, forms.CheckboxInput)
+
+    def label_tag(self):
+        classes = []
+        if self.is_checkbox:
+            classes.append('vCheckboxLabel')
+            contents = escape(self.field.label)
+        else:
+            contents = escape(self.field.label) + ':'
+        if self.field.field.required:
+            classes.append('required')
+        if not self.is_first:
+            classes.append('inline')
+        attrs = classes and {'class': ' '.join(classes)} or {}
+        return self.field.label_tag(contents=contents, attrs=attrs)
-
-class ModelAdmin(object):
@@ -203 +254 @@
-            post_url = '../../../'
-
-
+
+
-        if request.POST:
-            new_data = request.POST.copy()
-
-            if opts.has_field_type(models.FileField):
-                new_data.update(request.FILES)
-
-
-
-
-
-
+
+
+
+
-                pk_value = new_object._get_pk_val()
-                LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, str(new_object), ADDITION)
@@ -237 +286 @@
-                    return HttpResponseRedirect(post_url)
-        else:
-
-
-
-
-
-
-
-
-
-
+
-
-        c = template.RequestContext(request, {
-            'title': _('Add %s') % opts.verbose_name,
-
+
+
-            'is_popup': request.REQUEST.has_key('_popup'),
-            'show_delete': False,
-        })
-
-anipulator
+odel.AddManipulator()
-
-    def change_view(self, request, object_id):
@@ -273 +314 @@
-
-        try:
-manipulator = model.ChangeManipulator(
+obj = model._default_manager.get(pk=
-        except model.DoesNotExist:
-            raise Http404('%s object with primary key %r does not exist' % (model_name, escape(object_id)))
-
+        ModelForm = forms.form_for_instance(obj)
+
-        if request.POST:
-            new_data = request.POST.copy()
-
-            if opts.has_field_type(models.FileField):
-                new_data.update(request.FILES)
-
-
-
-
-
-
+
+
+
+
-                pk_value = new_object._get_pk_val()
-
-
+
+
+
-                change_message = []
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
+#
-                if not change_message:
-                    change_message = _('No fields changed.')
@@ -320 +362 @@
-                    return HttpResponseRedirect("../")
-        else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        c = template.RequestContext(request, {
-            'title': _('Change %s') % opts.verbose_name,
-
+
+
-            'object_id': object_id,
-manipulator.original_object
+obj
-            'is_popup': request.REQUEST.has_key('_popup'),
-        })
-anipulator
+odel.ChangeManipulator(object_id)
-
-    def changelist_view(self, request):

django/branches/newforms-admin/django/contrib/admin/templates/admin/change_form.html

@@ -35 +35 @@
-{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
-{% if save_on_top %}{% submit_row %}{% endif %}
-oldform.error_dict
+adminform.form.errors
-    <p class="errornote">
-oldform.error_dict
+adminform.form.errors
-    </p>
-{% endif %}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {% endfor %}
+        </div>
-    {% endfor %}
-
+ 
-{% endfor %}
+
-{% block after_field_sets %}{% endblock %}
+
-{% if change %}
-   {% if ordered_objects %}
@@ -62 +72 @@
-   {% endif %}
-{% endif %}
+
-{% for related_object in inline_related_objects %}{% edit_inline related_object %}{% endfor %}
+
-{% block after_related_objects %}{% endblock %}
+
-{% submit_row %}
+
-{% if add %}
-   <script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script>
-{% endif %}
+
-{% if auto_populated_fields %}
-   <script type="text/javascript">
@@ -73 +88 @@
-   </script>
-{% endif %}
+
-</div>
-</form></div>

django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py

@@ -48 +48 @@
-    }
-submit_row = register.inclusion_tag('admin/submit_line.html', takes_context=True)(submit_row)
-
-def field_label(bound_field):
-    class_names = []
-    if isinstance(bound_field.field, models.BooleanField):
-        class_names.append("vCheckboxLabel")
-        colon = ""
-    else:
-        if not bound_field.field.blank:
-            class_names.append('required')
-        if not bound_field.first:
-            class_names.append('inline')
-        colon = ":"
-    class_str = class_names and ' class="%s"' % ' '.join(class_names) or ''
-    return '<label for="%s"%s>%s%s</label> ' % (bound_field.element_id, class_str, \
-        capfirst(bound_field.field.verbose_name), colon)
-field_label = register.simple_tag(field_label)
-
-class FieldWidgetNode(template.Node):
@@ -217 +201 @@
-    return EditInlineNode(bits[1])
-edit_inline = register.tag(edit_inline)
-
-def admin_field_line(context, argument_val):
-    if isinstance(argument_val, AdminBoundField):
-        bound_fields = [argument_val]
-    else:
-        bound_fields = [bf for bf in argument_val]
-    add = context['add']
-    change = context['change']
-
-    class_names = ['form-row']
-    for bound_field in bound_fields:
-        for f in bound_field.form_fields:
-            if f.errors():
-                class_names.append('errors')
-                break
-
-    # Assumes BooleanFields won't be stacked next to each other!
-    if isinstance(bound_fields[0].field, models.BooleanField):
-        class_names.append('checkbox-row')
-
-    return {
-        'add': context['add'],
-        'change': context['change'],
-        'bound_fields': bound_fields,
-        'class_names': " ".join(class_names),
-    }
-admin_field_line = register.inclusion_tag('admin/field_line.html', takes_context=True)(admin_field_line)