[refactor] Simplify formset handling for outdoor locations in admin #157

Moved logic for rejecting floorplan for outdoor location from
django_loci.admin.LocationAdmin to django_loci.base.admin.AbstractLocationAdmin
to ensure the extendability.

Related to #157

(cherry picked from commit a12916c)

Author: pandafy

django_loci/admin.py

@@ -35,24 +35,6 @@ class LocationAdmin(AbstractLocationAdmin):
     form = LocationForm
     inlines = [FloorPlanInline]
 
-    # kept for backward compatibility with Django 3.2.18
-    def _create_formsets(self, request, obj, change):
-        # 'data' is not present in POST request for django 3.2.18
-        if request.method == 'POST' and not request.POST.get('data', None):
-            data = request.POST.copy()
-            if data['type'] == 'outdoor':
-                data['floorplan_set-TOTAL_FORMS'] = '0'
-            request.POST = data
-        return super()._create_formsets(request, obj, change)
-
-    # for django >= 4.0
-    def get_formset_kwargs(self, request, obj, inline, prefix):
-        formset_kwargs = super().get_formset_kwargs(request, obj, inline, prefix)
-        # manually set TOTAL_FORMS to 0 if the type is outdoor to avoid floorplan form creation
-        if request.method == 'POST' and formset_kwargs['data']['type'] == 'outdoor':
-            formset_kwargs['data']['floorplan_set-TOTAL_FORMS'] = '0'
-        return formset_kwargs
-
 
 class ObjectLocationForm(AbstractObjectLocationForm):
     class Meta(AbstractObjectLocationForm.Meta):

django_loci/base/admin.py

@@ -206,6 +206,23 @@ def floorplans_json_view(self, request, pk):
             )
         return JsonResponse({'choices': choices})
 
+    # kept for backward compatibility with Django 3.2.18
+    def _create_formsets(self, request, obj, change):
+        # 'data' is not present in POST request for django 3.2.18
+        if request.method == 'POST' and not request.POST.get('data', None):
+            data = request.POST.copy()
+            if data['type'] == 'outdoor':
+                data['floorplan_set-TOTAL_FORMS'] = '0'
+            request.POST = data
+        return super()._create_formsets(request, obj, change)
+
+    def get_formset_kwargs(self, request, obj, inline, prefix):
+        formset_kwargs = super().get_formset_kwargs(request, obj, inline, prefix)
+        # manually set TOTAL_FORMS to 0 if the type is outdoor to avoid floorplan form creation
+        if request.method == 'POST' and formset_kwargs['data']['type'] == 'outdoor':
+            formset_kwargs['data']['floorplan_set-TOTAL_FORMS'] = '0'
+        return formset_kwargs
+
 
 class UnvalidatedChoiceField(forms.ChoiceField):
     """

django_loci/tests/base/test_admin_inline.py

@@ -773,20 +773,23 @@ def test_add_indoor_location_without_floor(self):
     def test_add_outdoor_with_floorplan(self):
         self._login_as_admin()
         p = 'floorplan_set'
-        params = {
-            'name': 'test-add-outdoor-with-floorplan',
-            'type': 'outdoor',
-            'geometry': 'SRID=4326;POINT (12.512324 41.898703)',
-            'address': 'Piazza Venezia, Roma, Italia',
-            '{0}-0-floor'.format(p): '1',
-            '{0}-0-image'.format(p): self._get_simpleuploadedfile(),
-            '{0}-0-id'.format(p): '',
-            '{0}-0-location'.format(p): '',
-            '{0}-TOTAL_FORMS'.format(p): '1',
-            '{0}-INITIAL_FORMS'.format(p): '0',
-            '{0}-MIN_NUM_FORMS'.format(p): '0',
-            '{0}-MAX_NUM_FORMS'.format(p): '1',
-        }
+        params = self.params
+        params.update(
+            {
+                'name': 'test-add-outdoor-with-floorplan',
+                'type': 'outdoor',
+                'geometry': 'SRID=4326;POINT (12.512324 41.898703)',
+                'address': 'Piazza Venezia, Roma, Italia',
+                '{0}-0-floor'.format(p): '1',
+                '{0}-0-image'.format(p): self._get_simpleuploadedfile(),
+                '{0}-0-id'.format(p): '',
+                '{0}-0-location'.format(p): '',
+                '{0}-TOTAL_FORMS'.format(p): '1',
+                '{0}-INITIAL_FORMS'.format(p): '0',
+                '{0}-MIN_NUM_FORMS'.format(p): '0',
+                '{0}-MAX_NUM_FORMS'.format(p): '1',
+            }
+        )
         location_url = '{0}_{1}_add'.format(
             self.url_prefix, self.location_model.__name__.lower()
         )