Merge remote-tracking branch 'origin/master' into open

This commit is contained in:
2020-01-23 16:11:11 +00:00
20 changed files with 403 additions and 278 deletions

View File

@@ -23,7 +23,7 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
class Meta:
model = models.Profile
fields = ('username', 'email', 'first_name', 'last_name', 'initials', 'phone')
fields = ('username', 'email', 'first_name', 'last_name', 'initials')
def clean_initials(self):
"""
@@ -138,6 +138,11 @@ class EventForm(forms.ModelForm):
return item
def clean(self):
if self.cleaned_data.get("is_rig") and not (self.cleaned_data.get('person') or self.cleaned_data.get('organisation')):
raise forms.ValidationError('You haven\'t provided any client contact details. Please add a person or organisation.', code='contact')
return super(EventForm, self).clean()
def save(self, commit=True):
m = super(EventForm, self).save(commit=False)