From 877d20f399f2d9a0bb0505286de35b8df0a2e244 Mon Sep 17 00:00:00 2001 From: Emilie Date: Fri, 30 Dec 2016 17:16:36 +0100 Subject: [PATCH] [Timesheet] : add filter on projects --- app/organization/projects/admin.py | 5 +++-- app/organization/projects/models.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/organization/projects/admin.py b/app/organization/projects/admin.py index 21b0ba7f..11ad0ba2 100644 --- a/app/organization/projects/admin.py +++ b/app/organization/projects/admin.py @@ -32,6 +32,7 @@ from organization.pages.models import * from organization.media.models import Playlist from organization.pages.admin import PageImageInline from organization.projects.forms import DynamicContentProjectForm +from organization.core.admin import null_filter class ProjectLinkInline(StackedDynamicInlineAdmin): @@ -108,8 +109,8 @@ class ProjectAdminDisplayable(DisplayableAdmin): ProjectRelatedTitleAdmin, DynamicContentProjectInline] filter_horizontal = ['teams', 'organizations'] - list_filter = ['type', 'program', 'program_type', ] - list_display = ['title', 'date_from', 'date_to', 'status', 'admin_link'] + list_filter = ['type', 'program', 'program_type', null_filter('external_id')] + list_display = ['title', 'external_id', 'date_from', 'date_to', 'status', 'admin_link'] class ProjectTopicAdmin(BaseTranslationModelAdmin): diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py index 25b43911..af207b34 100644 --- a/app/organization/projects/models.py +++ b/app/organization/projects/models.py @@ -50,7 +50,7 @@ class Project(Displayable, Period, RichText): """(Project description)""" type = models.CharField(_('type'), max_length=128, choices=PROJECT_TYPE_CHOICES) - external_id = models.CharField(_('register ID'), blank=True, null=True, max_length=128) + external_id = models.CharField(_('external ID'), blank=True, null=True, max_length=128) program = models.ForeignKey('ProjectProgram', verbose_name=_('project program'), related_name='projects', blank=True, null=True, on_delete=models.SET_NULL) program_type = models.ForeignKey('ProjectProgramType', verbose_name=_('project program type'), related_name='projects', blank=True, null=True, on_delete=models.SET_NULL) lead_team = models.ForeignKey('organization-network.Team', verbose_name=_('lead team'), related_name='leader_projects', blank=True, null=True) -- 2.39.5