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

Merge branch 'master' into platform-admin

Browse Source 
Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py
This commit is contained in:
Rebecca Law
2016-03-18 16:32:10 +00:00
parent 13d9acf7dd ef1ec2c9a1
commit 402f55be23
66 changed files with 1356 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/main/dao/users_dao.py
View File

@@ -43,20 +43,11 @@ def increment_failed_login_count(id):
def activate_user(user):
user.state = 'active'
return user_api_client.update_user(user)
return user_api_client.activate_user(user)
def is_email_unique(email_address):
try:
if user_api_client.get_user_by_email(email_address):
return False
return True
except HTTPError as ex:
if ex.status_code == 404:
return True
else:
raise ex
return user_api_client.is_email_unique(email_address)
def send_verify_code(user_id, code_type, to):