Add request to formfield_for_dbfield signature; fix makinacorpus#260 (makinacorpus#261)

Author: Rikuoja

leaflet/admin.py

@@ -26,7 +26,7 @@ class LeafletGeoAdminMixin(object):
     display_raw = False
     settings_overrides = {}
 
-    def formfield_for_dbfield(self, db_field, **kwargs):
+    def formfield_for_dbfield(self, db_field, request=None, **kwargs):
         """
         Overloaded from ModelAdmin to set Leaflet widget
         in form field init params.
@@ -36,7 +36,6 @@ def formfield_for_dbfield(self, db_field, **kwargs):
                                        self.widget.supports_3d)
 
         if is_editable:
-            kwargs.pop('request', None)  # unsupported for form field
             # Setting the widget with the newly defined widget.
             widget = self.widget
             if 'widget' in kwargs and issubclass(kwargs['widget'], LeafletWidget):
@@ -47,7 +46,7 @@ def formfield_for_dbfield(self, db_field, **kwargs):
             kwargs['widget'] = self._get_map_widget(db_field, widget)
             return db_field.formfield(**kwargs)
         else:
-            return super(LeafletGeoAdminMixin, self).formfield_for_dbfield(db_field, **kwargs)
+            return super(LeafletGeoAdminMixin, self).formfield_for_dbfield(db_field, request, **kwargs)
 
     def _get_map_widget(self, db_field, widget):
         """

leaflet/tests/tests.py

@@ -180,7 +180,7 @@ class BaseLeafletGeoAdminTest(object):
     def setUp(self):
         self.modeladmin = self.leafletgeoadmin_class(DummyModel, DummyAdminSite())
         self.geomfield = DummyModel._meta.get_field('geom')
-        self.formfield = self.modeladmin.formfield_for_dbfield(self.geomfield)
+        self.formfield = self.modeladmin.formfield_for_dbfield(self.geomfield, None)
 
     def test_widget_for_field(self):
         widget = self.formfield.widget