Merge "Use Jira Oauth for user authentication"

1 files changed, 6 insertions, 9 deletions

diff --git a/tools/pharos-dashboard/account/forms.py b/tools/pharos-dashboard/account/forms.py
index 7893867f..14f11cda 100644
--- a/tools/pharos-dashboard/account/forms.py
+++ b/tools/pharos-dashboard/account/forms.py
@@ -1,17 +1,14 @@
 import django.forms as forms
 import pytz as pytz
 
-from registration.forms import RegistrationForm as BaseRegistrationForm
+from account.models import UserProfile
 
 
-class AccountSettingsForm(forms.Form):
-    fields = ['first_name', 'last_name', 'email', 'company', 'ssh_public_key', 'pgp_public_key',
-              'timezone']
+class AccountSettingsForm(forms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ['company', 'ssh_public_key', 'pgp_public_key', 'timezone']
 
-    first_name = forms.CharField(max_length=30)
-    last_name = forms.CharField(max_length=30)
-    email = forms.EmailField()
-    company = forms.CharField(max_length=30)
     ssh_public_key = forms.CharField(max_length=2048, widget=forms.Textarea)
     pgp_public_key = forms.CharField(max_length=2048, widget=forms.Textarea)
-    timezone = forms.ChoiceField(choices=[(x, x) for x in pytz.common_timezones], initial='UTC')
\ No newline at end of file
+    timezone = forms.ChoiceField(choices=[(x, x) for x in pytz.common_timezones], initial='UTC')