Ticket #3987: diff-dynamic.3.diff

db/models/fields/related.py

@@ -544 +544 @@
         setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related))
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.all()}
+        defaults = {'form_class': forms.ModelChoiceField}
+        #To prevent an useless query
+        if not 'queryset' in kwargs:
+            defaults['queryset'] = self.rel.to._default_manager.all()
         defaults.update(kwargs)
         return super(ForeignKey, self).formfield(**defaults)
 
@@ -605 +608 @@
             cls._meta.one_to_one_field = self
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.all()}
+        defaults = {'form_class': forms.ModelChoiceField}
+        if not 'queryset' in kwargs:
+            defaults['queryset'] = self.rel.to._default_manager.all()
         defaults.update(kwargs)
         return super(OneToOneField, self).formfield(**defaults)
 
@@ -711 +716 @@
         return getattr(obj, self.attname).all()
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.ModelMultipleChoiceField, 'queryset': self.rel.to._default_manager.all()}
+        defaults = {'form_class': forms.ModelMultipleChoiceField}
+        if not 'queryset' in kwargs:
+            defaults['queryset'] = self.rel.to._default_manager.all()
         defaults.update(kwargs)
         # If initial is passed in, it's a list of related objects, but the
         # MultipleChoiceField takes a list of IDs.

newforms/models.py

@@ -170 +170 @@
         if value in ('', None):
             return None
         try:
-            value = self.queryset.model._default_manager.get(pk=value)
+            value = self.queryset.get(pk=value)
         except self.queryset.model.DoesNotExist:
             raise ValidationError(ugettext(u'Select a valid choice. That choice is not one of the available choices.'))
         return value
@@ -193 +193 @@
         final_values = []
         for val in value:
             try:
-                obj = self.queryset.model._default_manager.get(pk=val)
+                obj = self.queryset.get(pk=val)
             except self.queryset.model.DoesNotExist:
                 raise ValidationError(ugettext(u'Select a valid choice. %s is not one of the available choices.') % val)
             else:

contrib/admin/options.py

@@ -103 +103 @@
     raw_id_fields = ()
     fields = None
 
-    def formfield_for_dbfield(self, db_field, **kwargs):
+    def formfield_for_dbfield(self, db_field, request, **kwargs):
         """
         Hook for specifying the form Field instance for a given database Field
         instance.
@@ -113 +113 @@
         # 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)
+            if hasattr(self, 'dynamic_%s_choices' % db_field.name):
+                formfield = db_field.formfield(queryset = getattr(self, 'dynamic_%s_choices' % db_field.name)(request, db_field.rel.to), **kwargs)
 
         # For DateTimeFields, use a special field and widget.
         if isinstance(db_field, models.DateTimeField):
@@ -133 +134 @@
 
         # For ForeignKey or ManyToManyFields, use a special widget.
         if isinstance(db_field, (models.ForeignKey, models.ManyToManyField)):
+            if hasattr(self, 'dynamic_%s_choices' % db_field.name):
+                formfield = db_field.formfield(queryset = getattr(self, 'dynamic_%s_choices' % db_field.name)(request, db_field.rel.to), **kwargs)
+            else:
+                formfield = db_field.formfield(**kwargs)
             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)
+                formfield.widget = widgets.ForeignKeyRawIdWidget(db_field.rel)
             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.widget.render = widgets.RelatedFieldWidgetWrapper(formfield.widget.render, db_field.rel)
-                return formfield
+            return formfield
+        
+        if isinstance(db_field, (models.OneToOneField)) and hasattr(self, 'dynamic_%s_choices' % db_field.name):
+            return db_field.formfield(queryset = getattr(self, 'dynamic_%s_choices' % db_field.name)(request, db_field.rel.to), **kwargs)
 
         # For any other type of field, just call its formfield() method.
         return db_field.formfield(**kwargs)
@@ -414 +420 @@
             # 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=lambda f, **kwargs: self.formfield_for_dbfield(f, request, **kwargs))
 
         inline_formsets = []
         if request.POST:
@@ -422 +428 @@
             if opts.has_field_type(models.FileField):
                 new_data.update(request.FILES)
             form = ModelForm(new_data)
-            for FormSet in self.get_inline_formsets():
+            for FormSet in self.get_inline_formsets(request):
                 inline_formset = FormSet(data=new_data)
                 inline_formsets.append(inline_formset)
             if all_valid(inline_formsets) and form.is_valid():
                 return self.save_add(request, model, form, inline_formsets, '../%s/')
         else:
             form = ModelForm(initial=request.GET)
-            for FormSet in self.get_inline_formsets():
+            for FormSet in self.get_inline_formsets(request):
                 inline_formset = FormSet()
                 inline_formsets.append(inline_formset)
 
@@ -467 +473 @@
         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=lambda f, **kwargs: self.formfield_for_dbfield(f, request, **kwargs))
 
         inline_formsets = []
         if request.POST:
@@ -475 +481 @@
             if opts.has_field_type(models.FileField):
                 new_data.update(request.FILES)
             form = ModelForm(new_data)
-            for FormSet in self.get_inline_formsets():
+            for FormSet in self.get_inline_formsets(request):
                 inline_formset = FormSet(obj, new_data)
                 inline_formsets.append(inline_formset)
 
@@ -483 +489 @@
                 return self.save_change(request, model, form, inline_formsets)
         else:
             form = ModelForm()
-            for FormSet in self.get_inline_formsets():
+            for FormSet in self.get_inline_formsets(request):
                 inline_formset = FormSet(obj)
                 inline_formsets.append(inline_formset)
 
@@ -610 +616 @@
         ]
         return render_to_response(template_list, extra_context, context_instance=template.RequestContext(request))
 
-    def get_inline_formsets(self):
+    def get_inline_formsets(self, request):
         inline_formset_classes = []
         for opts in self.inlines:
-            inline = inline_formset(self.model, opts.model, formfield_callback=opts.formfield_for_dbfield, fields=opts.fields, extra=opts.extra)
+            inline = inline_formset(self.model, opts.model, formfield_callback=lambda f, **kwargs: opts.formfield_for_dbfield(f, request, **kwargs), fields=opts.fields, extra=opts.extra)
             inline_formset_classes.append(inline)
         return inline_formset_classes