[qa] Fix merge conflicts and formatting issues

- Resolve remaining git conflict markers in admin.py
- Fix whitespace issue in serializers.py
- Format rest-api.rst documentation

Author: Eeshu-Yadav

docs/user/rest-api.rst

@@ -857,7 +857,7 @@ When using this strategy, in the response you can find the field
 credentials.
 
 Batch retrieve and update
-++++++++++++++++++++++++++
++++++++++++++++++++++++++
 
 .. code-block:: text
 
@@ -870,16 +870,16 @@ Used to retrieve or update a ``RadiusBatch`` instance.
 .. note::
 
     The ``organization`` field is **read-only** for existing batch objects
-    and cannot be changed via the API. This is intentional as changing
-    the organization after batch creation would be inconsistent.
+    and cannot be changed via the API. This is intentional as changing the
+    organization after batch creation would be inconsistent.
 
 Parameters for **GET**:
 
-===== ===========
+===== =================
 Param Description
-===== ===========
+===== =================
 id    UUID of the batch
-===== ===========
+===== =================
 
 Parameters for **PUT**/**PATCH** (only certain fields can be updated):
 

openwisp_radius/admin.py

@@ -463,31 +463,31 @@ def delete_selected_batches(self, request, queryset):
         )
 
     def get_readonly_fields(self, request, obj=None):
-<<<<<<< HEAD
-        readonly_fields = super(RadiusBatchAdmin, self).get_readonly_fields(
-            request, obj
-        )
+        readonly_fields = super().get_readonly_fields(request, obj)
         if obj and obj.status != "pending":
             return (
-=======
-        readonly_fields = super().get_readonly_fields(request, obj)
-        if obj:
-            return readonly_fields + (
->>>>>>> 1402441 ([admin/api] Make batch user creation organization field readonly #609)
                 "strategy",
                 "organization",
                 "prefix",
                 "csvfile",
                 "number_of_users",
                 "users",
                 "expiration_date",
-<<<<<<< HEAD
                 "name",
-                "organization",
                 "status",
             ) + readonly_fields
         elif obj:
-            return ("status",) + readonly_fields
+            # For existing objects with pending status, still make organization readonly
+            return readonly_fields + (
+                "strategy",
+                "organization",
+                "prefix",
+                "csvfile",
+                "number_of_users",
+                "users",
+                "expiration_date",
+                "status",
+            )
         return ("status",) + readonly_fields
 
     def has_delete_permission(self, request, obj=None):
@@ -514,10 +514,6 @@ def response_add(self, request, obj, post_url_continue=None):
         else:
             self.message_user(request, msg, messages.SUCCESS)
             return self.response_post_save_add(request, obj)
-=======
-            )
-        return readonly_fields
->>>>>>> 1402441 ([admin/api] Make batch user creation organization field readonly #609)
 
 
 # Inlines for UserAdmin & OrganizationAdmin

openwisp_radius/api/serializers.py

@@ -475,7 +475,7 @@ def validate(self, data):
         """
         # Remove organization_slug from data if provided (should not be changeable)
         data.pop("organization_slug", None)
-        
+
         strategy = data.get("strategy") or (self.instance and self.instance.strategy)
 
         if (