Revision 53bf2659 snf-astakos-app/astakos/im/forms.py

b/snf-astakos-app/astakos/im/forms.py
44 44
from django.utils.functional import lazy
45 45

  
46 46
from astakos.im.models import AstakosUser
47
from astakos.im.settings import INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL, BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL
47
from astakos.im.settings import INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL, BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL, RECAPTCHA_ENABLED
48 48
from astakos.im.widgets import DummyWidget, RecaptchaWidget, ApprovalTermsWidget
49 49

  
50 50
# since Django 1.4 use django.core.urlresolvers.reverse_lazy instead
......
81 81
        super(LocalUserCreationForm, self).__init__(*args, **kwargs)
82 82
        self.fields.keyOrder = ['email', 'first_name', 'last_name',
83 83
                                'password1', 'password2',
84
                                'has_signed_terms',
85
                                'recaptcha_challenge_field',
86
                                'recaptcha_response_field',]
84
                                'has_signed_terms']
85
        if RECAPTCHA_ENABLED:
86
            self.fields.keyOrder.extend(['recaptcha_challenge_field',
87
                                         'recaptcha_response_field',])
87 88
    
88 89
    def clean_email(self):
89 90
        email = self.cleaned_data['email']
......
150 151
        super(InvitedLocalUserCreationForm, self).__init__(*args, **kwargs)
151 152
        self.fields.keyOrder = ['email', 'inviter', 'first_name',
152 153
                                'last_name', 'password1', 'password2',
153
                                'has_signed_terms',
154
                                'recaptcha_challenge_field',
155
                                'recaptcha_response_field']
154
                                'has_signed_terms']
155
        if RECAPTCHA_ENABLED:
156
            self.fields.keyOrder.extend(['recaptcha_challenge_field',
157
                                         'recaptcha_response_field',])
158
        
156 159
        #set readonly form fields
157 160
        self.fields['inviter'].widget.attrs['readonly'] = True
158 161
        self.fields['email'].widget.attrs['readonly'] = True

Also available in: Unified diff