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

b/snf-astakos-app/astakos/im/forms.py
937 937
        'password': ['old_password', 'new_password1', 'new_password2']
938 938
    }
939 939

  
940
    fields = ('email')
940 941
    change_password = forms.BooleanField(initial=False, required=False)
941 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
            ]
942 957

  
943 958
    def __init__(self, *args, **kwargs):
944 959
        super(ExtendedProfileForm, self).__init__(*args, **kwargs)
......
950 965
        if EMAILCHANGE_ENABLED:
951 966
            self.email_change = True
952 967
        else:
968
            self.fields_list.remove('new_email_address')
953 969
            del self.fields['change_email']
954 970

  
955 971

  
956 972
        self._init_extra_forms()
957 973
        self.save_extra_forms = []
958 974
        self.success_messages = []
959

  
975
        self.fields.keyOrder = self.fields_list
976
        
977
         
960 978
    def _init_extra_form_fields(self):
961 979
        if self.email_change:
962 980
            self.fields.update(self.email_change_form.fields)

Also available in: Unified diff