Merge branch 'master' into develop

1 files changed, 7 insertions, 10 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index fa71c4d3f..a0224d4cd 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -262,15 +262,6 @@ class AuthorAdmin(admin.ModelAdmin):
 admin_site.register(models.Author, AuthorAdmin)
 
 
-class PersonTypeAdmin(admin.ModelAdmin):
-    list_display = ['label', 'txt_idx', 'available', 'comment']
-    model = models.PersonType
-    filter_vertical = ('groups',)
-
-
-admin_site.register(models.PersonType, PersonTypeAdmin)
-
-
 class GlobalVarAdmin(admin.ModelAdmin):
     list_display = ['slug', 'description', 'value']
 
@@ -285,7 +276,6 @@ class GeneralTypeAdmin(admin.ModelAdmin):
     prepopulated_fields = {"txt_idx": ("label",)}
     import_generic = gen_import_generic
 
-
 general_models = [models.OrganizationType, models.SourceType,
                   models.AuthorType, models.TitleType, models.Format,
                   models.SupportType]
@@ -293,6 +283,13 @@ for model in general_models:
     admin_site.register(model, GeneralTypeAdmin)
 
 
+class PersonTypeAdmin(GeneralTypeAdmin):
+    model = models.PersonType
+    filter_vertical = ('groups',)
+
+admin_site.register(models.PersonType, PersonTypeAdmin)
+
+
 class ImporterDefaultValuesInline(admin.TabularInline):
     model = models.ImporterDefaultValues