diff --git a/admin/views/users/user/user.html b/admin/views/users/user/user.html index eae9dd2d..9d92622a 100644 --- a/admin/views/users/user/user.html +++ b/admin/views/users/user/user.html @@ -36,7 +36,7 @@ {{'SETTING.EDIT' | translate}} {{'USER.RESET_PASSWORD' | translate}} {{'SETTING.DELETE' | translate}} - {{'SETTING.UNLOCK' | translate}} + {{'SETTING.UNLOCK' | translate}} diff --git a/myems-api/core/user.py b/myems-api/core/user.py index 6444a3ad..99116de0 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -60,7 +60,7 @@ class UserCollection: account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "password_expiration_datetime": password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), - "failed_login_count": row[10]} + "failed_login_count": True if row[10] < 3 else False} result.append(meta_result) resp.text = json.dumps(result)