From 0ad110ec7fbbcb2f715599120ddee4d00b8fab83 Mon Sep 17 00:00:00 2001 From: Jerome Flesch Date: Tue, 18 Oct 2016 15:35:41 +0200 Subject: [PATCH 1/2] forms.py: cleanup whitespaces Signed-off-by: Jerome Flesch --- helpdesk/forms.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index ecadc515..0f8219e6 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -77,7 +77,7 @@ class EditTicketForm(CustomFieldMixin, forms.ModelForm): class Meta: model = Ticket exclude = ('created', 'modified', 'status', 'on_hold', 'resolution', 'last_escalation', 'assigned_to') - + def __init__(self, *args, **kwargs): """ Add any custom fields that are defined to the form @@ -101,7 +101,7 @@ class EditTicketForm(CustomFieldMixin, forms.ModelForm): def save(self, *args, **kwargs): - + for field, value in self.cleaned_data.items(): if field.startswith('custom_'): field_name = field.replace('custom_', '', 1) @@ -112,7 +112,7 @@ class EditTicketForm(CustomFieldMixin, forms.ModelForm): cfv = TicketCustomFieldValue(ticket=self.instance, field=customfield) cfv.value = value cfv.save() - + return super(EditTicketForm, self).save(*args, **kwargs) @@ -228,7 +228,7 @@ class TicketForm(CustomFieldMixin, forms.Form): except User.DoesNotExist: t.assigned_to = None t.save() - + for field, value in self.cleaned_data.items(): if field.startswith('custom_'): field_name = field.replace('custom_', '', 1) @@ -251,7 +251,7 @@ class TicketForm(CustomFieldMixin, forms.Form): } f.save() - + files = [] if self.cleaned_data['attachment']: import mimetypes @@ -265,9 +265,9 @@ class TicketForm(CustomFieldMixin, forms.Form): ) a.file.save(file.name, file, save=False) a.save() - + if file.size < getattr(settings, 'MAX_EMAIL_ATTACHMENT_SIZE', 512000): - # Only files smaller than 512kb (or as defined in + # Only files smaller than 512kb (or as defined in # settings.MAX_EMAIL_ATTACHMENT_SIZE) are sent via email. try: files.append([a.filename, a.file]) @@ -276,7 +276,7 @@ class TicketForm(CustomFieldMixin, forms.Form): context = safe_template_context(t) context['comment'] = f.comment - + messages_sent_to = [] if t.submitter_email: @@ -443,9 +443,9 @@ class PublicTicketForm(CustomFieldMixin, forms.Form): ) a.file.save(file.name, file, save=False) a.save() - + if file.size < getattr(settings, 'MAX_EMAIL_ATTACHMENT_SIZE', 512000): - # Only files smaller than 512kb (or as defined in + # Only files smaller than 512kb (or as defined in # settings.MAX_EMAIL_ATTACHMENT_SIZE) are sent via email. files.append([a.filename, a.file]) @@ -549,7 +549,7 @@ class TicketCCForm(forms.ModelForm): users = User.objects.filter(is_active=True, is_staff=True).order_by(User.USERNAME_FIELD) else: users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD) - self.fields['user'].queryset = users + self.fields['user'].queryset = users class Meta: model = TicketCC exclude = ('ticket',) From 74668f30d54a3ee372375e866817b4776f4648d7 Mon Sep 17 00:00:00 2001 From: Jerome Flesch Date: Tue, 18 Oct 2016 15:37:57 +0200 Subject: [PATCH 2/2] forms.py : To get the translations for the fields' labels, use ugettext_lazy() instead for ugettext(). ugettext() loads the translations at the same time the module is loaded (--> always in english). ugettext_lazy() loads them when they are needed (--> when the user makes a query --> we known the language the user wants based on the header of their HTTP request) Signed-off-by: Jerome Flesch --- helpdesk/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index 0f8219e6..ed0993c0 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -15,7 +15,7 @@ from django import forms from django.forms import extras from django.core.files.storage import default_storage from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ try: from django.contrib.auth import get_user_model User = get_user_model()