From bdd96c830638acb41f52269d78a66ccf033c1f92 Mon Sep 17 00:00:00 2001 From: Okhin Date: Wed, 14 Jun 2017 12:12:01 +0200 Subject: [PATCH] Adding search fields to the campaign admin --- picampaign/campaign/admin.py | 2 ++ .../migrations/0011_auto_20170614_1204.py | 19 +++++++++++++++++++ picampaign/campaign/models.py | 4 ++++ 3 files changed, 25 insertions(+) create mode 100644 picampaign/campaign/migrations/0011_auto_20170614_1204.py diff --git a/picampaign/campaign/admin.py b/picampaign/campaign/admin.py index 4cdc872..1786360 100644 --- a/picampaign/campaign/admin.py +++ b/picampaign/campaign/admin.py @@ -21,6 +21,7 @@ class CampaignAdmin(TranslationAdmin): list_display = ('title', 'organization', 'start_date', 'end_date', 'phone_filter',) list_filter = ('organization', 'start_date', 'end_date',) list_select_related = ('organization',) + search_fields = ['title', 'organization__name'] def get_queryset(self, request): qs = super(CampaignAdmin, self).get_queryset(request) @@ -41,6 +42,7 @@ class CampaignContactAdmin(admin.ModelAdmin): list_display = ('contact', 'campaign', 'weight') list_select_related = ('contact', 'campaign',) list_filter = ('campaign',) + search_fields = ['campaign__title', 'contact__first_name', 'contact__last_name'] def get_queryset(self, request): qs = super(CampaignContactAdmin, self).get_queryset(request) diff --git a/picampaign/campaign/migrations/0011_auto_20170614_1204.py b/picampaign/campaign/migrations/0011_auto_20170614_1204.py new file mode 100644 index 0000000..e5ee1de --- /dev/null +++ b/picampaign/campaign/migrations/0011_auto_20170614_1204.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-06-14 10:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('campaign', '0010_auto_20170613_2015'), + ] + + operations = [ + migrations.AlterModelOptions( + name='argumentary', + options={'verbose_name': 'Argument', 'verbose_name_plural': 'Arguments'}, + ), + ] diff --git a/picampaign/campaign/models.py b/picampaign/campaign/models.py index 27b543e..8a96bfd 100644 --- a/picampaign/campaign/models.py +++ b/picampaign/campaign/models.py @@ -27,6 +27,10 @@ class Argumentary(models.Model): title = models.CharField(max_length=255, verbose_name=_('title'), null=True, blank=True) text = RichTextField(null=True) + class Meta: + verbose_name = _("Argument") + verbose_name_plural = _("Arguments") + def __str__(self): args = {'title': self.campaign.title} return _('Argumentary for %(title)s') % args -- GitLab