diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-01 16:24:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-01 16:24:09 +0200 |
| commit | f0901e79cd11ead1d5ac2543ac4affcf23a5f05f (patch) | |
| tree | 164ba8b9ae802c89bfecdd2d3f102a291d4dba0a /ishtar_common/admin.py | |
| parent | b5b06948f10f2429d15e81d0dce193341ca7c75b (diff) | |
| download | Ishtar-f0901e79cd11ead1d5ac2543ac4affcf23a5f05f.tar.bz2 Ishtar-f0901e79cd11ead1d5ac2543ac4affcf23a5f05f.zip | |
Archive item to exclude them from merge detection mechanism
Diffstat (limited to 'ishtar_common/admin.py')
| -rw-r--r-- | ishtar_common/admin.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 675d85ec5..fb0ab1170 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -112,8 +112,7 @@ class OrganizationAdmin(HistorizedObjectAdmin): list_display = ('pk', 'name', 'organization_type') list_filter = ("organization_type",) search_fields = ('name',) - exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', - 'exclude_from_merge') + exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', ) model = models.Organization admin.site.register(models.Organization, OrganizationAdmin) @@ -123,8 +122,7 @@ class PersonAdmin(HistorizedObjectAdmin): 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') + exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', ) model = models.Person admin.site.register(models.Person, PersonAdmin) |