Admin : improve admin for users and organizations

1 files changed, 6 insertions, 2 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 8c998deac..f8cc34208 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -101,18 +101,22 @@ admin.site.register(models.Department, DepartmentAdmin)
 
 
 class OrganizationAdmin(HistorizedObjectAdmin):
-    list_display = ('name', 'organization_type')
+    list_display = ('pk', 'name', 'organization_type')
     list_filter = ("organization_type",)
     search_fields = ('name',)
+    exclude = ('merge_key', 'merge_exclusion', 'merge_candidate',
+               'exclude_from_merge')
     model = models.Organization
 
 admin.site.register(models.Organization, OrganizationAdmin)
 
 
 class PersonAdmin(HistorizedObjectAdmin):
-    list_display = ('name', 'surname', 'raw_name', 'email')
+    list_display = ('pk', 'name', 'surname', 'raw_name', 'email')
     list_filter = ("person_types",)
     search_fields = ('name', 'surname', 'email', 'raw_name')
+    exclude = ('merge_key', 'merge_exclusion', 'merge_candidate',
+               'exclude_from_merge')
     model = models.Person
 
 admin.site.register(models.Person, PersonAdmin)