From 3d5ebb3ec2dd10ead1ae4e37dd69e3d32ddfd44f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 19 Aug 2021 14:47:33 +0200
Subject: [PATCH] indentation, unused code removed
---
smash/web/forms/appointment_form.py | 14 +++++++-------
smash/web/forms/mail_template.py | 6 ++----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/smash/web/forms/appointment_form.py b/smash/web/forms/appointment_form.py
index 602486aa..b9b2004d 100644
--- a/smash/web/forms/appointment_form.py
+++ b/smash/web/forms/appointment_form.py
@@ -34,13 +34,13 @@ class AppointmentForm(ModelForm):
for field in self.changed_data:
new_value = self.cleaned_data[field] or self.data[field]
if isinstance(new_value, QuerySet):
- new_human_values = '; '.join([str(element) for element in new_value])
+ new_human_values = '; '.join([str(element) for element in new_value])
new_value = ','.join([str(element.id) for element in new_value]) #overwrite variable
#old value
if self.instance.id: #update instance
list_of_values = getattr(self.instance, field).all()
- old_human_values = '; '.join([str(element) for element in list_of_values])
- previous_value = ','.join([str(element.id) for element in list_of_values])
+ old_human_values = '; '.join([str(element) for element in list_of_values])
+ previous_value = ','.join([str(element.id) for element in list_of_values])
else: #new instance
old_human_values = ''
previous_value = ''
@@ -91,8 +91,8 @@ class AppointmentEditForm(AppointmentForm):
else:
initial_appointment_types = []
fields = OrderedDict()
- for i, tuple in enumerate(self.fields.items()):
- key, value = tuple
+ for i, field_tuple in enumerate(self.fields.items()):
+ key, value = field_tuple
fields[key] = value
if i == APPOINTMENT_TYPES_FIELD_POSITION:
fields['appointment_types'] = forms.ModelMultipleChoiceField(required=False,
@@ -157,8 +157,8 @@ class AppointmentAddForm(AppointmentForm):
super(AppointmentAddForm, self).__init__(*args, **kwargs)
fields = OrderedDict()
- for i, tuple in enumerate(self.fields.items()):
- key, value = tuple
+ for i, field_tuple in enumerate(self.fields.items()):
+ key, value = field_tuple
fields[key] = value
if i == APPOINTMENT_TYPES_FIELD_POSITION:
fields['appointment_types'] = forms.ModelMultipleChoiceField(required=False,
diff --git a/smash/web/forms/mail_template.py b/smash/web/forms/mail_template.py
index cc14f13c..e642ec53 100644
--- a/smash/web/forms/mail_template.py
+++ b/smash/web/forms/mail_template.py
@@ -13,12 +13,10 @@ class MailTemplateForm(ModelForm):
def __init__(self, *args, **kwargs):
super(MailTemplateForm, self).__init__(*args, **kwargs)
- instance = getattr(self, 'instance', None)
-
self.fields['Multilingual'] = forms.BooleanField(label='Multilingual', disabled=True, required=False,
- help_text='Only for voucher context. Check this option if the voucher template is multilingual.',
+ help_text='Only for voucher context. Check this option if the voucher template is multilingual.',
widget=forms.CheckboxInput(attrs={'class': 'hidden_form_field', 'id': 'multilingual_checkbox'}))
def clean(self):
cleaned_data = super(MailTemplateForm, self).clean()
- return cleaned_data
\ No newline at end of file
+ return cleaned_data
--
GitLab