Merge pull request #770 from askvortsov1/master

Adjusted get_email management command to support custom User model
This commit is contained in:
Garret Wassermann 2019-08-05 19:19:03 -04:00 committed by GitHub
commit 843e8402fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,6 +31,8 @@ from bs4 import BeautifulSoup
from email_reply_parser import EmailReplyParser
from django.contrib.auth import get_user_model
from django.core.files.base import ContentFile
from django.core.files.uploadedfile import SimpleUploadedFile
from django.core.management.base import BaseCommand
@ -41,10 +43,11 @@ from django.utils import encoding, six, timezone
from helpdesk import settings
from helpdesk.lib import send_templated_mail, safe_template_context, process_attachments
from helpdesk.models import Queue, Ticket, TicketCC, FollowUp, IgnoreEmail
from django.contrib.auth.models import User
import logging
User = get_user_model()
STRIPPED_SUBJECT_STRINGS = [
"Re: ",