[fix] Fixed the order of inline admins

Author: pandafy

openwisp_controller/config/migrations/0064_remove_organizationconfigsettings_estimated_location_enabled_and_more.py

@@ -9,6 +9,9 @@ class Migration(migrations.Migration):
             "config",
             "0063_organizationconfigsettings_estimated_location_enabled_and_more",
         ),
+        # This dependency on the geo app is required to ensure that
+        # the data from OrganizationConfigSettings is properly migrated to GeoSettings
+        # before we remove the field.
         ("geo", "0006_create_geo_settings_for_existing_orgs"),
     ]
 

openwisp_controller/geo/admin.py

@@ -18,9 +18,9 @@
 
 from ..admin import MultitenantAdminMixin
 from ..config.admin import (
+    ConfigSettingsInline,
     DeactivatedDeviceReadOnlyMixin,
     DeviceAdminExportable,
-    OrganizationLimitsInline,
 )
 from .estimated_location.service import EstimatedLocationService
 from .exportable import GeoDeviceResource
@@ -227,7 +227,7 @@ def get_readonly_fields(self, request, obj=None):
 
 
 OrganizationAdmin.inlines.insert(
-    OrganizationAdmin.inlines.index(OrganizationLimitsInline) + 1,
+    OrganizationAdmin.inlines.index(ConfigSettingsInline) + 1,
     GeoSettingsInline,
 )
 # Prepend DeviceLocationInline to config.DeviceAdminExportable