Revision c55e39e7

b/snf-astakos-app/astakos/im/forms.py
940 940
    fields = ('email')
941 941
    change_password = forms.BooleanField(initial=False, required=False)
942 942
    change_email = forms.BooleanField(initial=False, required=False)
943
    
944
    fields_list = [
945
            'email',
946
            'new_email_address',
947
            'first_name',
948
            'last_name', 
949
            'auth_token',
950
            'auth_token_expires',
951
            'old_password',
952
            'new_password1',
953
            'new_password2',
954
            'change_email',
955
            'change_password',
956
            ]
943

  
957 944

  
958 945
    def __init__(self, *args, **kwargs):
946
        self.fields_list = [
947
                'email',
948
                'new_email_address',
949
                'first_name',
950
                'last_name',
951
                'auth_token',
952
                'auth_token_expires',
953
                'old_password',
954
                'new_password1',
955
                'new_password2',
956
                'change_email',
957
                'change_password',
958
        ]
959

  
959 960
        super(ExtendedProfileForm, self).__init__(*args, **kwargs)
960 961
        if self.instance.can_change_password():
961 962
            self.password_change = True
......
966 967
            self.fields_list.remove('change_password')
967 968
            del self.fields['change_password']
968 969

  
969
         
970

  
970 971
        if EMAILCHANGE_ENABLED:
971 972
            self.email_change = True
972 973
        else:
......
979 980
        self.save_extra_forms = []
980 981
        self.success_messages = []
981 982
        self.fields.keyOrder = self.fields_list
982
        
983
         
983

  
984

  
984 985
    def _init_extra_form_fields(self):
985 986
        if self.email_change:
986 987
            self.fields.update(self.email_change_form.fields)

Also available in: Unified diff