diff --git a/user_managment/app.py b/user_managment/app.py index bbba07a..3cad1f6 100644 --- a/user_managment/app.py +++ b/user_managment/app.py @@ -363,7 +363,7 @@ def create_app(): ''' #else: # content = content + '''\n

Error

''' - content = content + '''\n'


5: When asked for server ports, use the information above to populate the correct fields.
6: Reboot your Pi-Star device

+ content = content + '''\n


5: When asked for server ports, use the information above to populate the correct fields.
6: Reboot your Pi-Star device

@@ -756,8 +756,8 @@ def create_app(): Last Name -''' + u.first_name + ''' -''' + u.last_name + ''' + ''' + u.first_name + ''' + ''' + u.last_name + ''' City @@ -957,12 +957,12 @@ def create_app(): elif request.args.get('portal_username') and not request.args.get('flush_user_db') and not request.args.get('flush_dmr_id_db') or request.args.get('dmr_id') and not request.args.get('flush_user_db') and not request.args.get('flush_dmr_id_db'): if request.args.get('portal_username'): ## s_filter = portal_username=request.args.get('portal_username') - a = AuthLog.query.filter_by(portal_username=request.args.get('portal_username')).order_by(AuthLog.login_dmr_id.desc()).all() + a = AuthLog.query.filter_by(portal_username=request.args.get('portal_username')).order_by(AuthLog.login_time.desc()).all() g_arg = request.args.get('portal_username') f_link = '''

Flush auth log for: ''' + request.args.get('portal_username') + '''

''' elif request.args.get('dmr_id'): ## s_filter = login_dmr_id=request.args.get('dmr_id') - a = AuthLog.query.filter_by(login_dmr_id=request.args.get('dmr_id')).order_by(AuthLog.login_dmr_id.desc()).all() + a = AuthLog.query.filter_by(login_dmr_id=request.args.get('dmr_id')).order_by(AuthLog.login_time.desc()).all() g_arg = request.args.get('dmr_id') f_link = '''

Flush auth log for: ''' + request.args.get('dmr_id') + '''

''' ## print(s_filter) @@ -1040,7 +1040,7 @@ def create_app(): else: #a = AuthLog.query.all().order_by(AuthLog.login_dmr_id) #a = AuthLog.query.all() - a = AuthLog.query.order_by(AuthLog.login_dmr_id.desc()).limit(300).all() + a = AuthLog.query.order_by(AuthLog.login_time.desc()).limit(300).all() recent_list = [] ## r = AuthLog.query.order_by(AuthLog.login_dmr_id.desc()).all() content = '''