Ticket #3987: customfilters.diff

db/models/fields/related.py

@@ -545 +545 @@
         setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related))
 
     def formfield(self, **kwargs):
-        defaults = {'queryset': self.rel.to._default_manager.all(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+        filter_field = kwargs.get('filter', {})
+        if kwargs.has_key('filter'): del kwargs['filter']
+        defaults = {'queryset': self.rel.to._default_manager.all().filter(**filter_field), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
         return forms.ModelChoiceField(**defaults)
 
@@ -606 +608 @@
             cls._meta.one_to_one_field = self
 
     def formfield(self, **kwargs):
-        defaults = {'queryset': self.rel.to._default_manager.all(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+        filter_field = kwargs.get('filter', {})
+        if kwargs.has_key('filter'): del kwargs['filter']
+        defaults = {'queryset': self.rel.to._default_manager.all().filter(**filter_field), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
         return forms.ModelChoiceField(**defaults)
 
@@ -714 +718 @@
     def formfield(self, **kwargs):
         # If initial is passed in, it's a list of related objects, but the
         # MultipleChoiceField takes a list of IDs.
+        filter_field = kwargs.get('filter', {})
+        if kwargs.has_key('filter'): del kwargs['filter']
         if kwargs.get('initial') is not None:
             kwargs['initial'] = [i._get_pk_val() for i in kwargs['initial']]
-        defaults = {'queryset' : self.rel.to._default_manager.all(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+        defaults = {'queryset' : self.rel.to._default_manager.all().filter(**filter_field), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
         return forms.ModelMultipleChoiceField(**defaults)
 

contrib/admin/options.py

@@ -208 +208 @@
 
         If kwargs are given, they're passed to the form Field's constructor.
         """
+        filter_field = kwargs.get('filter_field', {})
+        if kwargs.has_key('filter_field'): del kwargs['filter_field']
         # For ManyToManyFields with a filter interface, use a special Widget.
         if isinstance(db_field, models.ManyToManyField) and db_field.name in (self.filter_vertical + self.filter_horizontal):
             kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
-            return db_field.formfield(**kwargs)
+            return db_field.formfield(filter=filter_field, **kwargs)
 
         # For DateTimeFields, use a special field and widget.
         if isinstance(db_field, models.DateTimeField):
@@ -233 +235 @@
         if isinstance(db_field, (models.ForeignKey, models.ManyToManyField)):
             if isinstance(db_field, models.ForeignKey) and db_field.name in self.raw_id_fields:
                 kwargs['widget'] = widgets.ForeignKeyRawIdWidget(db_field.rel)
-                return db_field.formfield(**kwargs)
+                return db_field.formfield(filter=filter_field, **kwargs)
             else:
                 # Wrap the widget's render() method with a method that adds
                 # extra HTML to the end of the rendered output.
-                formfield = db_field.formfield(**kwargs)
+                formfield = db_field.formfield(filter=filter_field, **kwargs)
                 formfield.widget.render = widgets.RelatedFieldWidgetWrapper(formfield.widget.render, db_field.rel)
                 return formfield
 
@@ -375 +377 @@
             request.user.message_set.create(message=msg)
             return HttpResponseRedirect("../")
 
-    def add_view(self, request, form_url=''):
+    def add_view(self, request, form_url='', fields_filters={}):
         "The 'add' admin view for this model."
         from django.contrib.admin.views.main import render_change_form
         model = self.model
@@ -392 +394 @@
             # Object list will give 'Permission Denied', so go back to admin home
             post_url = '../../../'
 
-        ModelForm = forms.form_for_model(model, formfield_callback=self.formfield_for_dbfield)
+        ModelForm = forms.form_for_model(model, formfield_callback=self.formfield_for_dbfield, fields_filters=fields_filters)
 
         if request.POST:
             new_data = request.POST.copy()
@@ -413 +415 @@
         })
         return render_change_form(self, model, model.AddManipulator(), c, add=True)
 
-    def change_view(self, request, object_id):
+    def change_view(self, request, object_id, fields_filters={}):
         "The 'change' admin view for this model."
         from django.contrib.admin.views.main import render_change_form
         model = self.model
@@ -437 +439 @@
         if request.POST and request.POST.has_key("_saveasnew"):
             return self.add_view(request, form_url='../../add/')
 
-        ModelForm = forms.form_for_instance(obj, formfield_callback=self.formfield_for_dbfield)
+        ModelForm = forms.form_for_instance(obj, formfield_callback=self.formfield_for_dbfield, fields_filters=fields_filters)
 
         if request.POST:
             new_data = request.POST.copy()

newforms/models.py

@@ -56 +56 @@
         return save_instance(self, instance, commit)
     return save
 
-def form_for_model(model, form=BaseForm, formfield_callback=lambda f: f.formfield()):
+def form_for_model(model, form=BaseForm, formfield_callback=lambda f: f.formfield(), fields_filters={}):
     """
     Returns a Form class for the given Django model class.
 
@@ -71 +71 @@
     for f in opts.fields + opts.many_to_many:
         if not f.editable:
             continue
-        formfield = formfield_callback(f)
+        filter_field = fields_filters.get(f.name)
+        if filter_field:
+            formfield = formfield_callback(f, filter_field=filter_field)
+        else:
+            formfield = formfield_callback(f)
         if formfield:
             field_list.append((f.name, formfield))
     fields = SortedDictFromList(field_list)
     return type(opts.object_name + 'Form', (form,), {'base_fields': fields, '_model': model, 'save': model_save})
 
-def form_for_instance(instance, form=BaseForm, formfield_callback=lambda f, **kwargs: f.formfield(**kwargs)):
+def form_for_instance(instance, form=BaseForm, fields_filters={}, formfield_callback=lambda f, **kwargs: f.formfield(**kwargs)):
     """
     Returns a Form class for the given Django model instance.
 
@@ -95 +99 @@
         if not f.editable:
             continue
         current_value = f.value_from_object(instance)
-        formfield = formfield_callback(f, initial=current_value)
+        filter_field = fields_filters.get(f.name)
+        if filter_field:
+            formfield = formfield_callback(f, filter_field=filter_field, initial=current_value)
+        else:
+            formfield = formfield_callback(f, initial=current_value)
         if formfield:
             field_list.append((f.name, formfield))
     fields = SortedDictFromList(field_list)