diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:44:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:44:05 +0200 |
| commit | c96cba070566ab4703504591a413b9c1e5106f3a (patch) | |
| tree | 34d3b440a0abefac2d3919aee4690c1ea1f704e5 /ishtar_common/admin.py | |
| parent | 0f03de06a49675ef16cf5ed0a297524554e06525 (diff) | |
| parent | 4190b4a7dc03c0b9f1ca4113b4d0706c1bfffa19 (diff) | |
| download | Ishtar-c96cba070566ab4703504591a413b9c1e5106f3a.tar.bz2 Ishtar-c96cba070566ab4703504591a413b9c1e5106f3a.zip | |
Merge branch 'v0.9' into wheezy
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) |