diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
| commit | 507d9eb44c328e13ffff26e4301d7e80bfc91f4d (patch) | |
| tree | b497011ebb4ea4b899eb3c5ebeae6af15c2816c4 /ishtar_common/admin.py | |
| parent | 7522e7a325fb8ebad5f20bbfb5253b4be24e2cd0 (diff) | |
| parent | 4509e950fbe35e6f529c4469dfc7802686fce28e (diff) | |
| download | Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.tar.bz2 Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/admin.py')
| -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) |