[fix] Fixed DeviceResource and GeoDeviceResource

Author: pandafy

Diff for: openwisp_controller/config/admin.py

@@ -22,6 +22,7 @@
 from django.utils.translation import gettext_lazy as _
 from flat_json_widget.widgets import FlatJsonWidget
 from import_export.admin import ImportExportMixin
+from import_export.forms import ExportForm
 from openwisp_ipam.filters import SubnetFilter
 from swapper import load_model
 
@@ -744,6 +745,7 @@ def add_reversion_following(cls, follow):
 
 
 class DeviceAdminExportable(ImportExportMixin, DeviceAdmin):
+    export_form_class = ExportForm
     resource_class = DeviceResource
     # needed to support both reversion and import-export
     change_list_template = 'admin/config/change_list_device.html'

Diff for: openwisp_controller/config/exportable.py

@@ -127,10 +127,10 @@ def validate_instance(
         if config.device_id != instance.id:
             config.device_id = instance.id
 
-    def after_save_instance(self, instance, using_transactions, dry_run):
-        super().after_save_instance(instance, using_transactions, dry_run)
-        if not dry_run:
-            # save config afte device has been imported
+    def after_save_instance(self, instance, row, **kwargs):
+        super().after_save_instance(instance, row, **kwargs)
+        if not self._is_dry_run(kwargs):
+            # save config after device has been imported
             if instance._has_config():
                 instance.config.save()
 

Diff for: openwisp_controller/config/tests/test_admin.py

@@ -83,7 +83,7 @@ def test_device_import_export_buttons(self):
 
     def test_device_export(self):
         response = self.client.post(
-            reverse(f'admin:{self.app_label}_device_export'), {'file_format': '0'}
+            reverse(f'admin:{self.app_label}_device_export'), {'format': '0'}
         )
         self.assertNotContains(response, 'error')
         self.assertIsNotNone(response.get('Content-Disposition'))
@@ -101,7 +101,7 @@ def test_device_import(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv},
+            {'format': '0', 'import_file': csv},
         )
         self.assertNotContains(response, 'errorlist')
         self.assertNotContains(response, 'Errors')
@@ -125,7 +125,7 @@ def test_device_import_empty_config(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -166,7 +166,7 @@ def test_device_import_missing_config(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -205,7 +205,7 @@ def test_device_import_config_not_templates(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -629,7 +629,7 @@ def test_device_import_with_group_apply_templates(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -675,7 +675,7 @@ def test_device_import_templates_and_config(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)

Diff for: openwisp_controller/geo/exportable.py

@@ -52,8 +52,8 @@ def dehydrate_coords(self, device):
         except (ObjectDoesNotExist, AttributeError):
             pass
 
-    def after_import_instance(self, instance, new, row_number=None, **kwargs):
-        super().after_import_instance(instance, new, row_number, **kwargs)
+    def after_init_instance(self, instance, new, row, **kwargs):
+        super().after_init_instance(instance, new, row, **kwargs)
         if not hasattr(instance, 'devicelocation'):
             instance.devicelocation = DeviceLocation()
 
@@ -68,9 +68,9 @@ def validate_instance(
         if device_location.location_id or device_location.floorplan_id:
             device_location.content_object_id = instance.id
 
-    def after_save_instance(self, instance, using_transactions, dry_run):
-        super().after_save_instance(instance, using_transactions, dry_run)
-        if not dry_run:
+    def after_save_instance(self, instance, row, **kwargs):
+        super().after_save_instance(instance, row, **kwargs)
+        if not self._is_dry_run(kwargs):
             device_location = instance.devicelocation
             if device_location.location_id or device_location.floorplan_id:
                 device_location.save()

Diff for: openwisp_controller/geo/tests/test_admin.py

@@ -196,7 +196,7 @@ def test_device_import_geo(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)
@@ -253,7 +253,7 @@ def test_device_import_geo_no_floorplan(self):
         csv = ContentFile(contents)
         response = self.client.post(
             reverse(f'admin:{self.app_label}_device_import'),
-            {'input_format': '0', 'import_file': csv, 'file_name': 'test.csv'},
+            {'format': '0', 'import_file': csv, 'file_name': 'test.csv'},
         )
         self.assertFalse(response.context['result'].has_errors())
         self.assertIn('confirm_form', response.context)