[admin] Remove org owner from organization add form #149

openwisp_users/admin.py

@@ -451,6 +451,18 @@ class OrganizationAdmin(BaseOrganizationAdmin, BaseAdmin, UUIDAdmin):
     readonly_fields = ['uuid']
     ordering = ['name']
 
+    def get_inline_instances(self, request, obj=None):
+        """
+        Remove OrganizationOwnerInline from organization add form
+        """
+        inlines = super().get_inline_instances(request, obj).copy()
+        if not obj:
+            for inline in inlines:
+                if isinstance(inline, OrganizationOwnerInline):
+                    inlines.remove(inline)
+                    break
+        return inlines
+
     def has_change_permission(self, request, obj=None):
         """
         Allow operator to change an organization only if

openwisp_users/tests/test_admin.py

@@ -854,11 +854,20 @@ def test_second_orguser_creates_no_org_owner(self):
         self.assertEqual(org_owner.organization, org)
         self.assertEqual(org_owner.organization_user, org_user)
 
-    def test_view_org_owner_org_admin(self):
+    def test_organzation_add_inline_owner_absent(self):
         self.client.force_login(self._get_admin())
-        r = self.client.get(reverse(f'admin:{self.app_label}_organization_add'))
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, 'Organization owners')
+        response = self.client.get(reverse(f'admin:{self.app_label}_organization_add'))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, 'Organization owners')
+
+    def test_organzation_change_inline_owner_present(self):
+        org = self._create_org()
+        self.client.force_login(self._get_admin())
+        response = self.client.get(
+            reverse(f'admin:{self.app_label}_organization_change', args=[org.pk])
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'Organization owners')
 
     @patch.object(
         OrganizationOwner, 'full_clean', side_effect=ValidationError('invalid')