From 2e48036f92aff9525a86f7f40a261bf1f9d094a5 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Fri, 15 Jan 2016 02:02:47 +0000 Subject: [PATCH] Actually handle the change to using a Sender model --- src/documents/admin.py | 2 +- src/documents/management/commands/consume.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/documents/admin.py b/src/documents/admin.py index d4249bfd9..b2944426b 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -7,7 +7,7 @@ from .models import Sender, Document class DocumentAdmin(admin.ModelAdmin): - search_fields = ("sender", "title", "content",) + search_fields = ("sender__name", "title", "content",) list_display = ("edit", "created", "sender", "title", "pdf") list_filter = ("created", "sender") save_on_top = True diff --git a/src/documents/management/commands/consume.py b/src/documents/management/commands/consume.py index df050fdb9..61a61ebdd 100644 --- a/src/documents/management/commands/consume.py +++ b/src/documents/management/commands/consume.py @@ -13,9 +13,10 @@ from PIL import Image from django.conf import settings from django.core.management.base import BaseCommand +from django.template.defaultfilters import slugify from django.utils import timezone -from documents.models import Document +from documents.models import Document, Sender class Command(BaseCommand): @@ -170,7 +171,10 @@ class Command(BaseCommand): m = re.match(self.PARSER_REGEX, pdf) if m: - return m.group(1), m.group(2) + sender_name, title = m.group(1), m.group(2) + sender, __ = Sender.objects.get_or_create( + name=sender_name, defaults={"slug": slugify(sender_name)}) + return sender, title return "", ""