211 

   211 

   212 class UserProfileAddForm(ModelForm):

   212 class UserProfileAddForm(ModelForm):

   213     class Meta:

   213     class Meta:

   214         model = UserProfile

   214         model = UserProfile

   215         fields = ('preferred_language', 'tags')

   215         fields = ('preferred_language', 'tags')

   216 

   221 

   217 class UserAddForm(forms.Form):

   222 class UserAddForm(forms.Form):

   218     note = forms.CharField(label=ugettext_lazy(u'Note'),

   223     note = forms.CharField(label=ugettext_lazy(u'Note'),

   219                            help_text=ugettext_lazy(u'Optional text to add to invitation email'),

   224                            help_text=ugettext_lazy(u'Optional text to add to invitation email'),

   220                            widget=forms.Textarea,

   225                            widget=forms.Textarea,

   546     return HttpResponseRedirect(reverse('index'))

   551     return HttpResponseRedirect(reverse('index'))

   547 

   552 

   548 def register(request):

   553 def register(request):

   549     if request.method == 'POST':

   554     if request.method == 'POST':

   550         userform = UserForm(request.POST)

   555         userform = UserForm(request.POST)

   552         

   557         

   553         if userform.is_valid() and userprofileaddform.is_valid():

   558         if userform.is_valid() and userprofileaddform.is_valid():

   554             data = userform.cleaned_data

   559             data = userform.cleaned_data

   555             data.update(userprofileaddform.cleaned_data)

   560             data.update(userprofileaddform.cleaned_data)

   556             user = UserProfile.objects.create_inactive_user(userform.cleaned_data['email'], False, **userprofileaddform.cleaned_data)

   561             user = UserProfile.objects.create_inactive_user(userform.cleaned_data['email'], False, **userprofileaddform.cleaned_data)

   563                 profile.send_activation_email()

   568                 profile.send_activation_email()

   564                 display_message(request, _(u"You've been registered, please check your email for the confirm message."))                

   569                 display_message(request, _(u"You've been registered, please check your email for the confirm message."))                

   565             return HttpResponseRedirect(reverse('index'))

   570             return HttpResponseRedirect(reverse('index'))

   566     else:    

   571     else:    

   567         userform = UserForm()

   572         userform = UserForm()

   569     

   574     

   570     return render_to_response('site/register.html', {'forms':[userform, userprofileaddform]}, context_instance=RequestContext(request))

   575     return render_to_response('site/register.html', {'forms':[userform, userprofileaddform]}, context_instance=RequestContext(request))