darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into error-handling

Browse Source 
Conflicts:
	app/main/views/invites.py
This commit is contained in:
Rebecca Law
2016-03-10 15:03:21 +00:00
parent 735ca07dee 8c250a7853
commit 4ba801edab
16 changed files with 219 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/views/invites.py
View File

@@ -2,8 +2,8 @@ from flask import (
redirect,
url_for,
session,
render_template
)
flash,
render_template)
from app.main import main
@@ -17,6 +17,7 @@ from app import (
@main.route("/invitation/<token>")
def accept_invite(token):
invited_user = invite_api_client.check_token(token)
if invited_user.status == 'cancelled':
from_user = user_api_client.get_user(invited_user.from_user)
service = get_service_by_id_or_404(invited_user.service)
@@ -24,6 +25,11 @@ def accept_invite(token):
from_user=from_user.name,
service_name=service['name'])
if invited_user.status == 'accepted':
session.pop('invited_user', None)
flash('You have already accepted this invitation', 'default')
return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
existing_user = user_api_client.get_user_by_email(invited_user.email_address)
session['invited_user'] = invited_user.serialize()