diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-28 10:06:43 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-28 10:06:43 +0100 |
| commit | 9db260f9ac48b885edc02f2ec1c4ad3269a4c0f8 (patch) | |
| tree | 4dc5a8bcb82b7d588e69ca6995b3a0ea50fbd807 | |
| parent | 616cff40745f6026f579e4977cc55ccbc0e7dd0d (diff) | |
| download | Ishtar-9db260f9ac48b885edc02f2ec1c4ad3269a4c0f8.tar.bz2 Ishtar-9db260f9ac48b885edc02f2ec1c4ad3269a4c0f8.zip | |
Admin : improve admin for users and organizations
| -rw-r--r-- | ishtar_common/admin.py | 8 |
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) |