diff --git a/user_managment/app.py b/user_managment/app.py index 70b4a59..ad5aef7 100644 --- a/user_managment/app.py +++ b/user_managment/app.py @@ -502,42 +502,6 @@ def create_app(): return render_template('flask_user_layout.html', markup_content = Markup(content)) - -## @app.route('/mmdvm_log', methods=['POST', 'GET']) -## @login_required # User must be authenticated -## @roles_required('Admin') -## def mmdvm_auth_list(): -## display_number = 200 -## content = ''' -##
Last ''' + str(display_number) + ''' logins or attempts.
-##User | -##DMR ID | -##Authentication | -##Time | -##
''' + str(i[1]) + ''' | -##''' + str(i[0]) + ''' | -##Value: ''' + str(i[2]) + '''\n DB: ''' + str(i[3]) + ''' |
-##''' + datetime.datetime.fromtimestamp(i[4]).strftime(time_format) + ''' | -##
User ''' + str(user) + ''' has been enabled.
\n''' if request.form.get('user_status') == "False": edit_user.active = False -## content = content + '''User ''' + str(user) + ''' has been disabled.
\n''' -## if user != edit_user.username: -## #print(user) -## #print(edit_user.username) -## #print('new uname') -## edit_user.username = user + content = content + '''User ''' + str(user) + ''' has been disabled.
\n''' +## print(request.form.get('username')) + if user != request.form.get('username'): +#### #print(edit_user.username) + content = content + '''User ''' + str(user) + ''' changed to ''' + request.form.get('username') + '''.
\n''' + edit_user.username = request.form.get('username') if request.form.get('email') != edit_user.email: edit_user.email = request.form.get('email') content = content + '''Changed email for user: ''' + str(user) + ''' to ''' + request.form.get('email') + '''
\n''' @@ -751,8 +717,34 @@ def create_app(): if u_role.role_id == 1: # Link to promote to User role_link = '''Revert to User role: ''' + str(u.username) + '''
\n''' - - + id_dict = ast.literal_eval(u.dmr_ids) + passphrase_list = ''' +DMR ID | +Passphrase | +
''' + str(i[0]) + ''' | +''' + str(gen_passphrase(int(i[0]))) + ''' | +
''' + str(i[0]) + ''' | +''' + legacy_passphrase + ''' | +
''' + str(i[0]) + ''' | +''' + str(i[1]) + ''' | +
@@ -774,6 +766,7 @@ def create_app():
+''' + passphrase_list + '''