Revision fffa19d2 snf-astakos-app/astakos/im/forms.py

b/snf-astakos-app/astakos/im/forms.py
55 55
from astakos.im.settings import (INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL,
56 56
    BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL,
57 57
    RECAPTCHA_ENABLED, LOGGING_LEVEL, PASSWORD_RESET_EMAIL_SUBJECT,
58
    NEWPASSWD_INVALIDATE_TOKEN, THIRDPARTY_ACC_ADDITIONAL_FIELDS
58
    NEWPASSWD_INVALIDATE_TOKEN
59 59
)
60 60
from astakos.im.widgets import DummyWidget, RecaptchaWidget
61 61
from astakos.im.functions import send_change_email
......
193 193
    )
194 194
    class Meta:
195 195
        model = AstakosUser
196
        fields = ['email', 'third_party_identifier']
196
        fields = ['email', 'third_party_identifier', 'first_name', 'last_name']
197 197

  
198 198
    def __init__(self, *args, **kwargs):
199 199
        """
......
219 219
                    % (reverse('latest_terms'), _("the terms"))
220 220
            self.fields['has_signed_terms'].label = \
221 221
                    mark_safe("I agree with %s" % terms_link_html)
222
        
223
        default = fields_for_model(
224
            self._meta.model,
225
            THIRDPARTY_ACC_ADDITIONAL_FIELDS.keys()
226
        )
227
        for fname, field in THIRDPARTY_ACC_ADDITIONAL_FIELDS.iteritems():
228
            if field:
229
                self.fields[fname] = field
230
            self.fields.setdefault(fname, default.get(fname))
231
            self.initial[fname] = getattr(self.instance, fname, None)
232 222
    
233 223
    def clean_email(self):
234 224
        email = self.cleaned_data['email']

Also available in: Unified diff