Changeset 4391

Timestamp:

01/22/07 00:48:10 (2 years ago)

Author:

adrian

Message:

newforms-admin: Added a custom formfield hook for the admin forms. The first customization is that ManyToManyFields? with 'filter_interface' set use a special widget, FilteredSelectMultiple?. This removes the need for the old filter_interface_script_maybe admin template tag.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (4 diffs)
• django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/widgets.py (added)

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

@@ -1 +1 @@
-from django import oldforms, template
-from django import newforms as forms
+from django.contrib.admin import widgets
-from django.core.exceptions import ImproperlyConfigured, PermissionDenied
-from django.db import models
@@ -196 +197 @@
-            yield fs
-
+    def formfield_for_dbfield(self, db_field, **kwargs):
+        """
+        Hook for specifying the form Field instance for a given database Field
+        instance.
+
+        If kwargs are given, they're passed to the form Field's constructor.
+        """
+        # For filter_interface ManyToManyFields, use a special Widget.
+        if isinstance(db_field, models.ManyToManyField) and db_field.rel.filter_interface:
+            widget = widgets.FilteredSelectMultiple(db_field.verbose_name, db_field.rel.filter_interface-1)
+            return db_field.formfield(widget=widget)
+        return db_field.formfield(**kwargs)
+
-    def has_add_permission(self, request):
-        "Returns True if the given request has permission to add an object."
@@ -239 +253 @@
-            post_url = '../../../'
-
-
+, formfield_callback=self.formfield_for_dbfield
-
-        if request.POST:
@@ -304 +318 @@
-            raise Http404('%s object with primary key %r does not exist' % (model_name, escape(object_id)))
-
-
+, formfield_callback=self.formfield_for_dbfield
-
-        if request.POST:

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

@@ -161 +161 @@
-auto_populated_field_script = register.simple_tag(auto_populated_field_script)
-
-def filter_interface_script_maybe(bound_field):
-    f = bound_field.field
-    if f.rel and isinstance(f.rel, models.ManyToManyRel) and f.rel.filter_interface:
-        return '<script type="text/javascript">addEvent(window, "load", function(e) {' \
-              ' SelectFilter.init("id_%s", "%s", %s, "%s"); });</script>\n' % (
-              f.name, f.verbose_name.replace('"', '\\"'), f.rel.filter_interface-1, settings.ADMIN_MEDIA_PREFIX)
-    else:
-        return ''
-filter_interface_script_maybe = register.simple_tag(filter_interface_script_maybe)
-
-def field_widget(parser, token):
-    bits = token.contents.split()