[admin] Avoided repetition of fields definition

rajatagarwal457 · Dec 20, 2017 · cedd6b7 · cedd6b7
1 parent 6f5d69b
commit cedd6b7
Showing 1 changed file with 5 additions and 43 deletions.
diff --git a/openwisp_controller/pki/admin.py b/openwisp_controller/pki/admin.py
@@ -9,58 +9,20 @@
 from .models import Ca, Cert
 
 
-class CaAdmin(MultitenantAdminMixin, VersionAdmin, BaseCaAdmin):
-    fields = ['name',
-              'organization',
-              'notes',
-              'key_length',
-              'digest',
-              'validity_start',
-              'validity_end',
-              'country_code',
-              'state',
-              'city',
-              'organization_name',
-              'email',
-              'common_name',
-              'extensions',
-              'serial_number',
-              'certificate',
-              'private_key',
-              'created',
-              'modified']
+class CaAdmin(MultitenantAdminMixin, VersionAdmin, AbstractCaAdmin):
+    pass
 
 
+CaAdmin.fields.insert(2, 'organization')
 CaAdmin.list_filter.insert(0, ('organization', MultitenantOrgFilter))
 CaAdmin.list_display.insert(1, 'organization')
 
 
-class CertAdmin(MultitenantAdminMixin, VersionAdmin, BaseCertAdmin):
+class CertAdmin(MultitenantAdminMixin, VersionAdmin, AbstractCertAdmin):
     multitenant_shared_relations = ('ca',)
-    fields = ['name',
-              'organization',
-              'ca',
-              'notes',
-              'revoked',
-              'revoked_at',
-              'key_length',
-              'digest',
-              'validity_start',
-              'validity_end',
-              'country_code',
-              'state',
-              'city',
-              'organization_name',
-              'email',
-              'common_name',
-              'extensions',
-              'serial_number',
-              'certificate',
-              'private_key',
-              'created',
-              'modified']
 
 
+CertAdmin.fields.insert(2, 'organization')
 CertAdmin.list_filter.insert(0, ('organization', MultitenantOrgFilter))
 CertAdmin.list_filter.remove('ca')
 CertAdmin.list_display.insert(1, 'organization')