Changeset 6072

Timestamp:

09/09/07 14:10:52 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Refactored edit inline support classes.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (11 diffs)
• django/branches/newforms-admin/django/contrib/admin/sites.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin/edit_inline_stacked.html (modified) (2 diffs)
• django/branches/newforms-admin/django/contrib/admin/templates/admin/edit_inline_tabular.html (modified) (2 diffs)

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

@@ -119 +119 @@
-    filter_vertical = ()
-    filter_horizontal = ()
+    prepopulated_fields = {}
+
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        """
@@ -161 +163 @@
-        # For any other type of field, just call its formfield() method.
-        return db_field.formfield(**kwargs)
+
+    def fieldsets(self, request):
+        """
+        Generator that yields Fieldset objects for use on add and change admin
+        form pages.
+
+        This default implementation looks at self.fields, but subclasses can
+        override this implementation and do something special based on the
+        given HttpRequest object.
+        """
+        if self.fields is None:
+            default_fields = [f.name for f in self.opts.fields + self.opts.many_to_many if f.editable and not isinstance(f, models.AutoField)]
+            yield Fieldset(fields=default_fields)
+        else:
+            for name, options in self.fields:
+                yield Fieldset(name, options['fields'], classes=options.get('classes', '').split(' '), description=options.get('description'))
-
-class ModelAdmin(BaseModelAdmin):
@@ -176 +194 @@
-    save_on_top = False
-    ordering = None
-    prepopulated_fields = {}
-    inlines = []
-
-
+, admin_site
-        self.model = model
-        self.opts = model._meta
+        self.admin_site = admin_site
+        self.inline_instances = []
+        for inline_class in self.inlines:
+            inline_instance = inline_class(self.model, self.admin_site)
+            self.inline_instances.append(inline_instance)
-
-    def __call__(self, request, url):
@@ -222 +244 @@
-    media = property(_media)
-    
-    def fieldsets(self, request):
-        """
-        Generator that yields Fieldset objects for use on add and change admin
-        form pages.
-
-        This default implementation looks at self.fields, but subclasses can
-        override this implementation and do something special based on the
-        given HttpRequest object.
-        """
-        if self.fields is None:
-            default_fields = [f.name for f in self.opts.fields + self.opts.many_to_many if f.editable and not isinstance(f, models.AutoField)]
-            yield Fieldset(fields=default_fields)
-        else:
-            for name, options in self.fields:
-                yield Fieldset(name, options['fields'], classes=options.get('classes', '').split(' '), description=options.get('description'))
-
-    def fieldsets_add(self, request):
-        "Hook for specifying Fieldsets for the add form."
@@ -428 +434 @@
-        for fs in inline_formsets:
-            media = media + fs.media
-
+
+
+
+
+
+
+
-        c = template.RequestContext(request, {
-            'title': _('Add %s') % opts.verbose_name,
@@ -435 +447 @@
-            'show_delete': False,
-            'media': media,
-bound_inlines': [BoundInline(i, fs) for i, fs in zip(self.inlines, inline_formsets)]
+inline_admin_formsets': inline_admin_formsets
-        })
-        return render_change_form(self, model, model.AddManipulator(), c, add=True)
@@ -498 +510 @@
-        for fs in inline_formsets:
-            media = media + fs.media
-
+
+
+
+
+
+
+
-        c = template.RequestContext(request, {
-            'title': _('Change %s') % opts.verbose_name,
@@ -506 +524 @@
-            'is_popup': request.REQUEST.has_key('_popup'),
-            'media': media,
-bound_inlines': [BoundInline(i, fs) for i, fs in zip(self.inlines, inline_formsets)]
+inline_admin_formsets': inline_admin_formsets
-        })
-        return render_change_form(self, model, model.ChangeManipulator(object_id), c, change=True)
@@ -610 +628 @@
-
-    def get_inline_formsets(self):
-
-
-
-
-
+
+
-
-class InlineModelAdmin(BaseModelAdmin):
@@ -624 +639 @@
-    ``ForeignKey`` to its parent.
-    """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        """
-        Generator that yields Fieldset objects for use on add and change admin
@@ -680 +661 @@
-        given HttpRequest object.
-        """
-
-
-
-
-
+
+
+
+
-                yield Fieldset(name, options['fields'], classes=options.get('classes', '').split(' '), description=options.get('description'))
-
+class StackedInline(InlineModelAdmin):
+    template = 'admin/edit_inline_stacked.html'
+
+    def get_label(self):
+        return self.label or self.model._meta.verbose_name
+
+class TabularInline(InlineModelAdmin):
+    template = 'admin/edit_inline_tabular.html'
+
+    def get_label(self):
+        return self.label or self.model._meta.verbose_name_plural
+
+class InlineAdminFormSet(object):
+    """
+    A wrapper around an inline formset for use in the admin system.
+    """
+    def __init__(self, inline, formset, fieldsets):
+        self.opts = inline
+        self.formset = formset
+        self.fieldsets = fieldsets
+
+    def __iter__(self):
+        for form, original in zip(self.formset.change_forms, self.formset.get_inline_objects()):
+            yield InlineAdminForm(self.formset, form, self.fieldsets, self.opts.prepopulated_fields, original)
+        for form in self.formset.add_forms:
+            yield InlineAdminForm(self.formset, form, self.fieldsets, self.opts.prepopulated_fields, None)
+
+    def fields(self):
+        # TODO: this needs to respect the field order of self.fieldsets
+        return self.formset.form_class.base_fields.values()
+
+class InlineAdminForm(AdminForm):
+    """
+    A wrapper around an inline form for use in the admin system.
+    """
+    def __init__(self, formset, form, fieldsets, prepopulated_fields, original):
+        self.formset = formset
+        self.original = original
+        super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields)
+
-    def pk_field(self):
-base_
+
-
-    def deletion_field(self):
-        from django.newforms.formsets import DELETION_FIELD_NAME
-base_
+
-
-    def ordering_field(self):
-        from django.newforms.formsets import ORDERING_FIELD_NAME
-base_
+

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

@@ -78 +78 @@
-            if model in self._registry:
-                raise AlreadyRegistered('The model %s is already registered' % model.__name__)
-
+, self
-
-    def unregister(self, model_or_iterable):

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

@@ -1 @@
-bound_inline
-bound_inline_object in bound_inline
+inline_admin_formset
+inline_admin_form in inline_admin_formset
-<fieldset class="module aligned {{ bfset.fieldset.classes }}">
-
-
-
-
+
+
+
+
+
+
-      {% for line in bfset %}
-          <div class="form-row{% if line.errors %} errors{% endif %}">
@@ -19 +21 @@
-          </div>
-      {% endfor %}
-
-
+
-  {% endfor %}
+  {{ inline_admin_form.pk_field.field }}
+  {% if inline_admin_formset.formset.deletable %}<div class="form-row">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</div>{% endif %}
-</fieldset>
-{% endfor %}

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

@@ -1 +1 @@
-{% load i18n %}
-bound_inline
+inline_admin_formset
-<fieldset class="module">
-bound_inline.verbose_name_plura
+inline_admin_formset.opts.get_labe
-   <table>
-     <thead><tr>
-bound_inline
-bound_inline
+inline_admin_formset
+inline_admin_formset
-       {% if not field.is_hidden %}
-         <th>{{ field.label|capfirst|escape }}</th>
@@ -13 +13 @@
-     </tr></thead>
-   
-bound_inline_object in bound_inline
+inline_admin_form in inline_admin_formset
-   
-        <!-- still need optional original object -->
-        
-bound_inline_object.
+inline_admin_
-           <tr class="errorlist"><td colspan="{{ bound_inline.fields|length }}">
-bound_inline_object.
+inline_admin_
-           </tr>
-        {% endif %}
-        
-        <tr class="{% cycle row1,row2 %}">
-bound_inline_object
-bound_inline.formset.deletable %}<td>{{ bound_inline_object
-bound_inline_object.
+inline_admin_form
+inline_admin_formset.formset.deletable %}<td>{{ inline_admin_form
+inline_admin_
-          {% for line in bfset %}
-            {% for field in line %}