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

Fix bug with user model. Removed is_locked from serialized method.

Browse Source
This commit is contained in:
Rebecca Law
2016-01-26 14:34:21 +00:00
parent 54a322bb7a
commit 1c9b71a750
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models.py
View File

@@ -56,7 +56,6 @@ class User(db.Model):
'id': self.id, 'id': self.id,
'name': self.name, 'name': self.name,
'emailAddress': self.email_address, 'emailAddress': self.email_address,
'locked': self.failed_login_count > current_app.config['MAX_FAILED_LOGIN_COUNT'],
'createdAt': self.created_at.strftime(DATETIME_FORMAT), 'createdAt': self.created_at.strftime(DATETIME_FORMAT),
'updatedAt': self.updated_at.strftime(DATETIME_FORMAT), 'updatedAt': self.updated_at.strftime(DATETIME_FORMAT),
'role': self.role, 'role': self.role,

3
app/notify_client/user_api_client.py
View File

@@ -160,6 +160,5 @@ class User(object):
"mobile_number": self.mobile_number, "mobile_number": self.mobile_number,
"password_changed_at": self.password_changed_at, "password_changed_at": self.password_changed_at,
"state": self.state, "state": self.state,
"failed_login_count": self.failed_login_count, "failed_login_count": self.failed_login_count
"is_locked": self.is_locked()
} }