X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fforms.py;h=46a60bd4716f8cb854f5c0b02b5a7f9c649db975;hb=b5b1c487c354a2f66be7c4dc1f92ab514af76554;hp=43be69826dc52898d4e84852d5bfdaca998e8a79;hpb=4ee78b17e6c8bb54fc94bcddd6b0abb3d8c1a0fc;p=myslice.git diff --git a/portal/forms.py b/portal/forms.py index 43be6982..46a60bd4 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -5,6 +5,7 @@ # # Authors: # Jordan Augé +# Mohammed-Yasin Rahman # Copyright 2013, UPMC Sorbonne Universités / LIP6 # # This program is free software; you can redistribute it and/or modify it under @@ -24,26 +25,86 @@ from django import forms from portal.models import PendingUser, PendingSlice #from crispy_forms.helper import FormHelper #from crispy_forms.layout import Submit +from django.utils.translation import ugettext_lazy as _ -class UserRegisterForm(forms.ModelForm): -# DEPRECATED # def __init__(self, *args, **kwargs): -# DEPRECATED # self.helper = FormHelper() -# DEPRECATED # self.helper.form_tag = False -# DEPRECATED # #self.helper.form_id = 'id-exampleForm' -# DEPRECATED # self.helper.form_class = 'blueForms' -# DEPRECATED # self.helper.form_method = 'post' -# DEPRECATED # #self.helper.form_action = 'submit_survey' -# DEPRECATED # self.helper.add_input(Submit('submit', 'Submit')) -# DEPRECATED # super(RegisterUserForm, self).__init__(*args, **kwargs) - - first_name = forms.CharField( widget=forms.TextInput ) - last_name = forms.CharField( widget=forms.TextInput ) - email = forms.CharField( widget=forms.TextInput ) - password = forms.CharField( widget=forms.PasswordInput ) - password2 = forms.CharField( widget=forms.PasswordInput ) - keypair = forms.CharField( widget=forms.FileInput ) - class Meta: - model = PendingUser +# DEPRECATED # class UserRegisterForm(forms.Form): # Not ModelForm +# DEPRECATED # """ +# DEPRECATED # Form for registering a new user account. +# DEPRECATED # +# DEPRECATED # Validates that the requested username is not already in use, and +# DEPRECATED # requires the password to be entered twice to catch typos. +# DEPRECATED # +# DEPRECATED # Subclasses should feel free to add any additional validation they +# DEPRECATED # need, but should avoid defining a ``save()`` method -- the actual +# DEPRECATED # saving of collected user data is delegated to the active +# DEPRECATED # registration backend. +# DEPRECATED # +# DEPRECATED # """ +# DEPRECATED # required_css_class = 'required' +# DEPRECATED # +# DEPRECATED # first_name = forms.RegexField(regex=r'^[\w+\s.@+-]+$', +# DEPRECATED # max_length=30, +# DEPRECATED # label=_("First name"), +# DEPRECATED # error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) +# DEPRECATED # last_name = forms.RegexField(regex=r'^[\w+\s.@+-]+$', +# DEPRECATED # max_length=30, +# DEPRECATED # label=_("Last name"), +# DEPRECATED # error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) +# DEPRECATED # affiliation = forms.RegexField(regex=r'^[\w+\s.@+-]+$', +# DEPRECATED # max_length=30, +# DEPRECATED # label=_("Affiliation"), +# DEPRECATED # error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) +# DEPRECATED # +# DEPRECATED # email = forms.EmailField(label=_("E-mail")) +# DEPRECATED # password1 = forms.CharField(widget=forms.PasswordInput, +# DEPRECATED # label=_("Password")) +# DEPRECATED # password2 = forms.CharField(widget=forms.PasswordInput, +# DEPRECATED # label=_("Password (again)")) +# DEPRECATED # keypair = forms.CharField( widget=forms.FileInput ) +# DEPRECATED # +# DEPRECATED # #my_keypairs = forms.ChoiceField(widget = forms.Select(), +# DEPRECATED # # choices = ([('1','generate'), ('2','upload')])) +# DEPRECATED # tos = forms.BooleanField(widget=forms.CheckboxInput, +# DEPRECATED # label=_(u'I have read and agree to the Terms of Service'), +# DEPRECATED # error_messages={'required': _("You must agree to the terms to register")}) +# DEPRECATED # +# DEPRECATED # # def clean_username(self): +# DEPRECATED # # """ +# DEPRECATED # # Validate that the username is alphanumeric and is not already +# DEPRECATED # # in use. +# DEPRECATED # # +# DEPRECATED # # """ +# DEPRECATED # # existing = User.objects.filter(username__iexact=self.cleaned_data['username']) +# DEPRECATED # # if existing.exists(): +# DEPRECATED # # raise forms.ValidationError(_("A user with that username already exists.")) +# DEPRECATED # # else: +# DEPRECATED # # return self.cleaned_data['username'] +# DEPRECATED # +# DEPRECATED # def clean_email(self): +# DEPRECATED # """ +# DEPRECATED # Validate that the supplied email address is unique for the +# DEPRECATED # site. +# DEPRECATED # +# DEPRECATED # """ +# DEPRECATED # if PendingUser.objects.filter(email__iexact=self.cleaned_data['email']): +# DEPRECATED # raise forms.ValidationError(_("This email address is already in use. Please supply a different email address.")) +# DEPRECATED # return self.cleaned_data['email'] +# DEPRECATED # +# DEPRECATED # def clean(self): +# DEPRECATED # """ +# DEPRECATED # Verifiy that the values entered into the two password fields +# DEPRECATED # match. Note that an error here will end up in +# DEPRECATED # ``non_field_errors()`` because it doesn't apply to a single +# DEPRECATED # field. +# DEPRECATED # +# DEPRECATED # """ +# DEPRECATED # if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data: +# DEPRECATED # if self.cleaned_data['password1'] != self.cleaned_data['password2']: +# DEPRECATED # raise forms.ValidationError(_("The two password fields didn't match.")) +# DEPRECATED # return self.cleaned_data +# DEPRECATED # +# DEPRECATED # class Meta: +# DEPRECATED # model = PendingUser class SliceRequestForm(forms.ModelForm): slice_name = forms.CharField( widget=forms.TextInput ) @@ -53,3 +114,22 @@ class SliceRequestForm(forms.ModelForm): # DEPRECATED #class RegisterUserStep2Form(forms.ModelForm): # DEPRECATED # class Meta: # DEPRECATED # model = PendingUser + +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) + +