aboutsummaryrefslogtreecommitdiffstats
path: root/src/account
diff options
context:
space:
mode:
authorSawyer Bergeron <sbergeron@iol.unh.edu>2017-12-06 16:48:31 -0500
committerSawyer Bergeron <sbergeron@iol.unh.edu>2017-12-07 15:14:01 -0500
commit9742d5a8d6ee629e99581dc69c491a04f6a2f2ac (patch)
tree6974d839f5018adcc36dd19232c2aefb37888d0c /src/account
parent42763c659dd029cbe2c88e2292f638fd0735825e (diff)
Integrate Initial Email Support
JIRA: None Integrate ability for users to change email presented to admins with field initially filled with user's Jira associated email address This amend takes into account a streamlining change suggested by Parker Berbarian Change-Id: I677ce669f200e5cad70c198737118f0b7925bac5 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Diffstat (limited to 'src/account')
-rw-r--r--src/account/forms.py2
-rw-r--r--src/account/models.py1
-rw-r--r--src/account/views.py2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/account/forms.py b/src/account/forms.py
index 7653e2b..3b9c627 100644
--- a/src/account/forms.py
+++ b/src/account/forms.py
@@ -17,6 +17,6 @@ from account.models import UserProfile
class AccountSettingsForm(forms.ModelForm):
class Meta:
model = UserProfile
- fields = ['company', 'ssh_public_key', 'pgp_public_key', 'timezone']
+ fields = ['company', 'email_addr', 'ssh_public_key', 'pgp_public_key', 'timezone']
timezone = forms.ChoiceField(choices=[(x, x) for x in pytz.common_timezones], initial='UTC')
diff --git a/src/account/models.py b/src/account/models.py
index c2e9902..bfc0bbe 100644
--- a/src/account/models.py
+++ b/src/account/models.py
@@ -20,6 +20,7 @@ class UserProfile(models.Model):
timezone = models.CharField(max_length=100, blank=False, default='UTC')
ssh_public_key = models.FileField(upload_to=upload_to, null=True, blank=True)
pgp_public_key = models.FileField(upload_to=upload_to, null=True, blank=True)
+ email_addr = models.CharField(max_length=300, blank=false, default='email@mail.com')
company = models.CharField(max_length=200, blank=False)
oauth_token = models.CharField(max_length=1024, blank=False)
diff --git a/src/account/views.py b/src/account/views.py
index 17fbdc3..e6a0e5d 100644
--- a/src/account/views.py
+++ b/src/account/views.py
@@ -119,6 +119,7 @@ class JiraAuthenticatedView(RedirectView):
jira = JIRA(server=settings.JIRA_URL, oauth=oauth_dict)
username = jira.current_user()
+ email = jira.user(username).emailAddress
url = '/'
# Step 3. Lookup the user or create them if they don't exist.
try:
@@ -130,6 +131,7 @@ class JiraAuthenticatedView(RedirectView):
profile = UserProfile()
profile.user = user
profile.save()
+ user.userprofile.email_addr = email
url = reverse('account:settings')
user.userprofile.oauth_token = access_token['oauth_token']
user.userprofile.oauth_secret = access_token['oauth_token_secret']