darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 10:59:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master.

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-29 22:50:40 +01:00
parent 3e16fc1962
commit 644336b151
16 changed files with 91 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/sign_in.py
View File

@@ -14,9 +14,8 @@ from flask.ext.login import (
)
from app.main import main
from app.main.dao import services_dao
from app import user_api_client
from app import (user_api_client, service_api_client)
from app.main.forms import LoginForm
@@ -41,7 +40,7 @@ def sign_in():
current_user.id == user.id and \
user.is_active():
confirm_login()
services = services_dao.get_services(user.id).get('data', [])
services = service_api_client.get_services({'user_id': str(user.id)}).get('data', [])
if (len(services) == 1):
return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
else: