From 837c990f95f063bda23a273450bd000b3ff0582c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 29 Sep 2016 18:05:00 +0200 Subject: [PATCH] Add more person admin filter --- app/organization/network/admin.py | 3 ++- app/organization/network/models.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/organization/network/admin.py b/app/organization/network/admin.py index 87508dc5..f329742a 100644 --- a/app/organization/network/admin.py +++ b/app/organization/network/admin.py @@ -120,7 +120,8 @@ class PersonAdmin(BaseTranslationOrderedModelAdmin): PersonFileInline ] first_fields = ['last_name', 'first_name', 'title', 'gender', 'user'] search_fields = ['last_name', 'first_name'] - + list_display = ['last_name', 'first_name', 'email', 'gender'] + list_filter = ['person_title', 'activities__date_from', 'activities__date_to', 'activities__is_permanent', 'activities__framework', 'activities__grade', 'activities__function', 'activities__team', 'activities__project',] class PersonListBlockInlineAdmin(TabularDynamicInlineAdmin): diff --git a/app/organization/network/models.py b/app/organization/network/models.py index 21e3ff98..8408ef6c 100644 --- a/app/organization/network/models.py +++ b/app/organization/network/models.py @@ -355,7 +355,7 @@ class UMR(Named): class PersonActivity(Period): """(Activity description)""" - person = models.ForeignKey('Person', verbose_name=_('person')) + person = models.ForeignKey('Person', verbose_name=_('person'), related_name='activities') weeks = models.IntegerField(_('number of weeks'), blank=True, null=True) status = models.ForeignKey(ActivityStatus, verbose_name=_('status'), blank=True, null=True, on_delete=models.SET_NULL) -- 2.39.5