diff --git a/picampaign/organization/admin.py b/picampaign/organization/admin.py index a6c65fb7da4ff48a1d223c094573c6e451fb3612..a0345b9a6ad4d77356e0783f3e421d67e8ef294d 100644 --- a/picampaign/organization/admin.py +++ b/picampaign/organization/admin.py @@ -17,6 +17,8 @@ class GroupInline(admin.TabularInline): class GroupTypeAdmin(admin.ModelAdmin): + list_display = ('name', 'organization',) + list_filter = ('organization',) inlines = [GroupInline] def get_queryset(self, request): @@ -37,6 +39,10 @@ class GroupTypeAdmin(admin.ModelAdmin): class GroupAdmin(admin.ModelAdmin): + list_display = ('name', 'type', 'organization',) + list_filter = ('type',) + search_fields = ['name',] + def get_queryset(self, request): qs = super(GroupAdmin, self).get_queryset(request) if request.user.is_superuser: diff --git a/picampaign/organization/models.py b/picampaign/organization/models.py index 06f2c7ae1fb85a56b38bc9061df786c6adbfa7ce..fde85ae4c3e559dfa14d99504bf4494720783b6b 100644 --- a/picampaign/organization/models.py +++ b/picampaign/organization/models.py @@ -38,6 +38,9 @@ class Group(models.Model): contacts = models.ManyToManyField(Contact, blank=True, related_name='groups') + def organization(self): + return self.type.organization + def __str__(self): return self.name