X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fforms.py;h=9bcf8fa6ab74029fc7a4f23cbdb3be7483cf1088;hb=fd13b08e5ae01e312431803eb1faf38a1589c4b9;hp=ab563d9d3591b215825f0fb7915ce843b98df999;hpb=e33ccb0d215722ca404f3fde37f7a9c83e41ab0b;p=myslice.git diff --git a/portal/forms.py b/portal/forms.py index ab563d9d..9bcf8fa6 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -27,106 +27,84 @@ from portal.models import PendingUser, PendingSlice #from crispy_forms.layout import Submit from django.utils.translation import ugettext_lazy as _ -class UserRegisterForm(forms.Form): # Not ModelForm - """ - Form for registering a new user account. - - Validates that the requested username is not already in use, and - requires the password to be entered twice to catch typos. - - Subclasses should feel free to add any additional validation they - need, but should avoid defining a ``save()`` method -- the actual - saving of collected user data is delegated to the active - registration backend. - - """ - required_css_class = 'required' - - first_name = forms.RegexField(regex=r'^[\w.@+-]+$', - max_length=30, - label=_("First name"), - error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) - last_name = forms.RegexField(regex=r'^[\w.@+-]+$', - max_length=30, - label=_("Last name"), - error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) - affiliation = forms.RegexField(regex=r'^[\w.@+-]+$', - max_length=30, - label=_("Affiliation"), - error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) - - email = forms.EmailField(label=_("E-mail")) - password1 = forms.CharField(widget=forms.PasswordInput, - label=_("Password")) - password2 = forms.CharField(widget=forms.PasswordInput, - label=_("Password (again)")) - keypair = forms.CharField( widget=forms.FileInput ) - - tos = forms.BooleanField(widget=forms.CheckboxInput, - label=_(u'I have read and agree to the Terms of Service'), - error_messages={'required': _("You must agree to the terms to register")}) - -# def clean_username(self): -# """ -# Validate that the username is alphanumeric and is not already -# in use. -# -# """ -# existing = User.objects.filter(username__iexact=self.cleaned_data['username']) -# if existing.exists(): -# raise forms.ValidationError(_("A user with that username already exists.")) -# else: -# return self.cleaned_data['username'] +# xxx painful, but... +# bootstrap3 requires the fields to be tagged class='form-control' +# my first idea was to add this in the view template of course, BUT +# I can't find a way to access the 'type=' value for a given field +# I've looked rather deeply out there but to no avail so far +# so as we have a demo coming up soon, and until we can come with a less intrusive way to handle this... +# +# initial version was +#class ContactForm(forms.Form): +# first_name = forms.CharField() +# last_name = forms.CharField() +# affiliation = forms.CharField() +# subject = forms.CharField(max_length=100) +# message = forms.CharField(widget=forms.Textarea) +# email = forms.EmailField() +# cc_myself = forms.BooleanField(required=False) - def clean_email(self): - """ - Validate that the supplied email address is unique for the - site. - - """ - if PendingUser.objects.filter(email__iexact=self.cleaned_data['email']): - raise forms.ValidationError(_("This email address is already in use. Please supply a different email address.")) - return self.cleaned_data['email'] +class ContactForm(forms.Form): + first_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) + last_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) + affiliation = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) + email = forms.EmailField(widget=forms.TextInput(attrs={'class':'form-control'})) + subject = forms.CharField(max_length=100,widget=forms.TextInput(attrs={'class':'form-control'})) + message = forms.CharField(widget=forms.Textarea(attrs={'class':'form-control'})) + cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'})) - def clean(self): - """ - Verifiy that the values entered into the two password fields - match. Note that an error here will end up in - ``non_field_errors()`` because it doesn't apply to a single - field. - - """ - if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data: - if self.cleaned_data['password1'] != self.cleaned_data['password2']: - raise forms.ValidationError(_("The two password fields didn't match.")) - return self.cleaned_data +class SliceRequestForm(forms.Form): +# slice_name = forms.CharField() +# authority_hrn = forms.ChoiceField(choices=[(1, 'un')]) +# number_of_nodes = forms.DecimalField() +# type_of_nodes = forms.CharField() +# purpose = forms.CharField(widget=forms.Textarea) +# email = forms.EmailField() +# cc_myself = forms.BooleanField(required=False) -# DEPRECATED # class Meta: -# DEPRECATED # model = PendingUser + slice_name = forms.CharField( + widget=forms.TextInput(attrs={'class':'form-control'}), + help_text="The name for the slice you wish to create") + authority_hrn = forms.ChoiceField( + widget = forms.Select(attrs={'class':'form-control'}), + choices = [], + help_text = "An authority responsible for vetting your slice") + number_of_nodes = forms.DecimalField( + widget = forms.TextInput(attrs={'class':'form-control'}), + help_text = "The number of nodes you expect to request (informative)") + type_of_nodes = forms.CharField( + widget = forms.TextInput(attrs={'class':'form-control'}), + help_text = "The type of nodes you expect to request (informative)") + purpose = forms.CharField( + widget = forms.Textarea(attrs={'class':'form-control'}), + help_text = "The purpose of your experiment (informative)") + email = forms.EmailField( + widget = forms.TextInput(attrs={'class':'form-control'}), + help_text = "Your email address") + cc_myself = forms.BooleanField( + widget = forms.CheckboxInput(attrs={'class':'form-control'}), + required = False, + help_text = "If you'd like to be cc'ed on the request email") -class SliceRequestForm(forms.ModelForm): - slice_name = forms.CharField( widget=forms.TextInput ) - class Meta: - model = PendingSlice + def __init__(self, *args, **kwargs): + initial = kwargs.get('initial', {}) + authority_hrn = initial.get('authority_hrn', None) -# DEPRECATED #class RegisterUserStep2Form(forms.ModelForm): -# DEPRECATED # class Meta: -# DEPRECATED # model = PendingUser + # set just the initial value + # in the real form needs something like this {'authority_hrn':'a'} + # but in this case you want {'authority_hrn':('a', 'letter_a')} + if authority_hrn: + kwargs['initial']['authority_hrn'] = authority_hrn[0] -class ContactForm(forms.Form): - first_name = forms.CharField() - last_name = forms.CharField() - affiliation = forms.CharField() - subject = forms.CharField(max_length=100) - message = forms.CharField(widget=forms.Textarea) - email = forms.EmailField() - cc_myself = forms.BooleanField(required=False) - -class SliceRequestForm(forms.Form): - slice_name = forms.CharField() - number_of_nodes = forms.DecimalField() - type_of_nodes = forms.CharField() - purpose = forms.CharField(widget=forms.Textarea) - email = forms.EmailField() - cc_myself = forms.BooleanField(required=False) + # create the form + super(SliceRequestForm, self).__init__(*args, **kwargs) + # self.fields only exist after, so a double validation is needed + if authority_hrn:# and authority_hrn[0] not in (c[0] for c in authority_hrn): + # XXX This does not work, the choicefield is not updated... + #self.fields['authority_hrn'].choices.extend(authority_hrn) + self.fields['authority_hrn'] = forms.ChoiceField( + widget = forms.Select(attrs={'class':'form-control'}), + choices = authority_hrn, + help_text = "An authority responsible for vetting your slice") +