X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fforms.py;h=afbf3442ef674c889a8442bcc5134b512ac49bdc;hb=c530f4c2ee9dfe6da3c2349a73796dc38fc4e5bf;hp=df5c1a67a6b59c9b1d8cad2b57dc0690881dfc2b;hpb=0c34b56ff3e9887a592363ce92753a6a8383aa45;p=myslice.git diff --git a/portal/forms.py b/portal/forms.py index df5c1a67..afbf3442 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -28,6 +28,10 @@ from portal.models import PendingUser, PendingSlice from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.tokens import default_token_generator from django.contrib.auth import authenticate, get_user_model +# TODO: Remove these automated forms and use html templates and views like any other page ! +# ERROR ImportError: cannot import name UNUSABLE_PASSWORD +# XXX This is not compatible with Django 1.6.1 +# Ref: https://github.com/dot2code/varnish-bans-manager/issues/8 from django.contrib.auth.hashers import UNUSABLE_PASSWORD, identify_hasher from django.contrib.sites.models import get_current_site from django.utils.http import int_to_base36 @@ -56,10 +60,10 @@ from django.template import loader 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'})) + authority = 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'})) + description = forms.CharField(widget=forms.Textarea(attrs={'class':'form-control'})) cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'})) class PassResetForm(forms.Form):