From 38a1ee2c0f6b1c8d8d819e5a0e0e09d1a40a1074 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Fri, 4 Jun 2021 14:34:39 -0700 Subject: [PATCH] cosmetic changes --- user_managment/app.py | 13 +++++++------ .../templates/flask_user/edit_user_profile.html | 2 +- user_managment/templates/flask_user_layout.html | 6 +++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/user_managment/app.py b/user_managment/app.py index 2c1a4d3..bbba07a 100644 --- a/user_managment/app.py +++ b/user_managment/app.py @@ -538,13 +538,14 @@ def create_app(): @login_required # User must be authenticated def list_users(): u = User.query.all() - u_list = '''

List/edit users:

 

Enter Callsign

 

+ # Broken for now, link taken out -

List/edit users:

 

Enter Callsign

+ u_list = '''

 

- +''' for i in u: @@ -573,7 +574,7 @@ def create_app(): - +''' for i in u: ## print(i.username) @@ -969,7 +970,7 @@ def create_app(): content = '''

 

-

Log for user: ''' + g_arg + '''

+

Log for: ''' + g_arg + '''

''' + f_link + ''' @@ -1364,7 +1365,7 @@ def create_app(): mode='normal', ) elif authorized_peer(hblink_req['login_id'])[1] == '': - authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'Config: ' + legacy_passphrase, 'Attempt') + authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'Config Passphrase: ' + legacy_passphrase, 'Attempt') response = jsonify( allow=True, mode='legacy', @@ -1405,7 +1406,7 @@ def create_app(): response = make_response(msg, 401) elif 'login_id' in hblink_req and 'login_confirmed' in hblink_req: if hblink_req['old_auth'] == True: - authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'CONFIG PASSPHRASE', 'Confirmed') + authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'CONFIG, NO UMS', 'Confirmed') else: authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'USER MANAGER', 'Confirmed') response = jsonify( diff --git a/user_managment/templates/flask_user/edit_user_profile.html b/user_managment/templates/flask_user/edit_user_profile.html index 6f1e7d1..ad30a56 100644 --- a/user_managment/templates/flask_user/edit_user_profile.html +++ b/user_managment/templates/flask_user/edit_user_profile.html @@ -17,7 +17,7 @@ {% endfor %}
-

Update your information from RadioID.net

+

Update your information from RadioID.net

{% if not user_manager.USER_ENABLE_AUTH0 %} {% if user_manager.USER_ENABLE_CHANGE_USERNAME %}

{%trans%}Change username{%endtrans%}

diff --git a/user_managment/templates/flask_user_layout.html b/user_managment/templates/flask_user_layout.html index bbdf8f7..cb4c0bb 100644 --- a/user_managment/templates/flask_user_layout.html +++ b/user_managment/templates/flask_user_layout.html @@ -110,12 +110,16 @@

{% endblock %} -
Callsign Name EnabledDMR ID:Authentication MechanismDMR ID:Authentication Notes
Callsign Name EnabledDMR ID:Authentication MechanismDMR ID:Authentication