extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 08:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.2.22 bugfix release updates, update copyright year in license, specify python 3.6 or above in setup

Browse Source
This commit is contained in:
Garret Wassermann
2020-07-30 04:46:15 -04:00
parent d3232fef10 7d89a9ae1d
commit 2f788f2597
17 changed files with 2390 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helpdesk/lib.py
View File

@ -129,7 +129,7 @@ def text_is_spam(text, request):
def process_attachments(followup, attached_files):
max_email_attachment_size = getattr(settings, 'MAX_EMAIL_ATTACHMENT_SIZE', 512000)
max_email_attachment_size = getattr(settings, 'HELPDESK_MAX_EMAIL_ATTACHMENT_SIZE', 512000)
attachments = []
for attached in attached_files:
@ -149,7 +149,7 @@ def process_attachments(followup, attached_files):
if attached.size < max_email_attachment_size:
# Only files smaller than 512kb (or as defined in
# settings.MAX_EMAIL_ATTACHMENT_SIZE) are sent via email.
# settings.HELPDESK_MAX_EMAIL_ATTACHMENT_SIZE) are sent via email.
attachments.append([filename, att.file])
return attachments