Skip to content

Commit 61a1685

Browse files
committed
Updated the admin interface to use the simple-history admin support for Person history.
- Legacy-Id: 15097
1 parent c7d31b4 commit 61a1685

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

ietf/person/admin.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django.contrib import admin
2+
import simple_history
23

3-
4-
from ietf.person.models import Email, Alias, Person, PersonalApiKey, PersonEvent, PersonApiKeyEvent, HistoricalPerson
4+
from ietf.person.models import Email, Alias, Person, PersonalApiKey, PersonEvent, PersonApiKeyEvent
55
from ietf.person.name import name_parts
66

77
class EmailAdmin(admin.ModelAdmin):
@@ -22,7 +22,7 @@ class AliasAdmin(admin.ModelAdmin):
2222
class AliasInline(admin.StackedInline):
2323
model = Alias
2424

25-
class PersonAdmin(admin.ModelAdmin):
25+
class PersonAdmin(simple_history.admin.SimpleHistoryAdmin):
2626
def plain_name(self, obj):
2727
prefix, first, middle, last, suffix = name_parts(obj.name)
2828
return "%s %s" % (first, last)
@@ -53,12 +53,3 @@ class PersonApiKeyEventAdmin(admin.ModelAdmin):
5353
admin.site.register(PersonApiKeyEvent, PersonApiKeyEventAdmin)
5454

5555

56-
class HistoricalPersonAdmin(admin.ModelAdmin):
57-
def plain_name(self, obj):
58-
prefix, first, middle, last, suffix = name_parts(obj.name)
59-
return "%s %s" % (first, last)
60-
list_display = ["history_date", "name", "plain_name", "time", "history_user", "history_change_reason", ]
61-
search_fields = ["name", "ascii"]
62-
raw_id_fields = ["user", "history_user", ]
63-
# actions = None
64-
admin.site.register(HistoricalPerson, HistoricalPersonAdmin)

ietf/utils/tests.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,11 @@ def test_all_model_admins_exist(self):
307307
#
308308
model_list = apps.get_app_config(name).get_models()
309309
for model in model_list:
310-
self.assertContains(r, model._meta.model_name,
311-
msg_prefix="There doesn't seem to be any admin API for model %s.models.%s"%(app.__name__,model.__name__,))
310+
if model.__name__.startswith('Historical') and hasattr(model, "get_history_type_display"):
311+
continue
312+
else:
313+
self.assertContains(r, model._meta.model_name,
314+
msg_prefix="There doesn't seem to be any admin API for model %s.models.%s"%(app.__name__,model.__name__,))
312315

313316
## One might think that the code below would work, but it doesn't ...
314317

0 commit comments

Comments
 (0)