From eeaa09285813543420c4cfcc3112904ccdc8c264 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Mon, 2 Aug 2021 11:19:50 -0700 Subject: [PATCH] add public server notes --- web/app.py | 37 +++++++++++++++++++++++----- web/templates/flask_user_layout.html | 3 +-- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/web/app.py b/web/app.py index 476e8dd..d810a80 100644 --- a/web/app.py +++ b/web/app.py @@ -294,6 +294,7 @@ def create_app(): unit_time = db.Column(db.Integer(), primary_key=False, server_default='10080') notes = db.Column(db.String(100), nullable=False, server_default='') dash_url = db.Column(db.String(100), nullable=True, server_default='https://hbnet.xyz') + public_notes = db.Column(db.String(100), nullable=False, server_default='') class MasterList(db.Model): __tablename__ = 'master_list' @@ -674,6 +675,10 @@ def create_app():

Server: ''' + i.name + '''

+ + ''' + i.public_notes + ''' + + Available Talkgroups @@ -1566,10 +1571,16 @@ def create_app(): content = content + '' return render_template('flask_user_layout.html', markup_content = Markup(content)) + +## if news_enabled: @app.route('/news') #, methods=['POST', 'GET']) ## @login_required def view_news(): + view_news = News.query.order_by(News.time.desc()).all() +## page = request.args.get('page', 1, type=int) +## view_news = News.query.order_by(News.time.desc()).paginate(page=page, per_page=1) + #content = '''''' content = '' for article in view_news: @@ -1609,7 +1620,7 @@ def create_app():
- @@ -1873,6 +1884,9 @@ def create_app(): ''' + tg_list + ''' + + +

+

 
 Description
 Disconnect 4000 Disconnect from all activated TGs.
''' + '''''' tg_list = '' @@ -2527,7 +2541,7 @@ def create_app(): db.session.commit() - def server_edit(_name, _secret, _ip, _port, _global_path, _global_ping_time, _global_max_missed, _global_use_acl, _global_reg_acl, _global_sub_acl, _global_tg1_acl, _global_tg2_acl, _ai_subscriber_file, _ai_try_download, _ai_path, _ai_peer_file, _ai_tgid_file, _ai_peer_url, _ai_subs_url, _ai_stale, _um_shorten_passphrase, _um_burn_file, _report_enable, _report_interval, _report_port, _report_clients, _unit_time, _notes, _dash_url): + def server_edit(_name, _secret, _ip, _port, _global_path, _global_ping_time, _global_max_missed, _global_use_acl, _global_reg_acl, _global_sub_acl, _global_tg1_acl, _global_tg2_acl, _ai_subscriber_file, _ai_try_download, _ai_path, _ai_peer_file, _ai_tgid_file, _ai_peer_url, _ai_subs_url, _ai_stale, _um_shorten_passphrase, _um_burn_file, _report_enable, _report_interval, _report_port, _report_clients, _unit_time, _notes, _dash_url, _public_notes): s = ServerList.query.filter_by(name=_name).first() # print(_name) if _secret == '': @@ -2565,6 +2579,7 @@ def create_app(): s.unit_time = int(_unit_time) s.notes = _notes s.dash_url = _dash_url + s.public_notes = _public_notes db.session.commit() def master_delete(_mode, _server, _name): @@ -2748,7 +2763,7 @@ def create_app(): db.session.commit() - def server_add(_name, _secret, _ip, _port, _global_path, _global_ping_time, _global_max_missed, _global_use_acl, _global_reg_acl, _global_sub_acl, _global_tg1_acl, _global_tg2_acl, _ai_subscriber_file, _ai_try_download, _ai_path, _ai_peer_file, _ai_tgid_file, _ai_peer_url, _ai_subs_url, _ai_stale, _um_shorten_passphrase, _um_burn_file, _report_enable, _report_interval, _report_port, _report_clients, _unit_time, _notes, _dash_url): + def server_add(_name, _secret, _ip, _port, _global_path, _global_ping_time, _global_max_missed, _global_use_acl, _global_reg_acl, _global_sub_acl, _global_tg1_acl, _global_tg2_acl, _ai_subscriber_file, _ai_try_download, _ai_path, _ai_peer_file, _ai_tgid_file, _ai_peer_url, _ai_subs_url, _ai_stale, _um_shorten_passphrase, _um_burn_file, _report_enable, _report_interval, _report_port, _report_clients, _unit_time, _notes, _dash_url, _public_notes): add_server = ServerList( name = _name, secret = hashlib.sha256(_secret.encode()).hexdigest(), @@ -2783,7 +2798,8 @@ def create_app(): report_clients = _report_clients, unit_time = int(_unit_time), notes = _notes, - dash_url = _dash_url + dash_url = _dash_url, + public_notes = _public_notes ) db.session.add(add_server) db.session.commit() @@ -2976,13 +2992,13 @@ def create_app():

Redirecting in 3 seconds.

''' else: - server_add(request.form.get('server_name'), request.form.get('server_secret'), request.form.get('server_ip'), _port, request.form.get('global_path'), _global_ping_time, _global_max_missed, _global_use_acl, request.form.get('reg_acl'), request.form.get('sub_acl'), request.form.get('global_ts1_acl'), request.form.get('global_ts2_acl'), request.form.get('sub_file'), _ai_try_download, request.form.get('aliases_path'), request.form.get('peer_file'), request.form.get('tgid_file'), request.form.get('peer_url'), request.form.get('sub_url'), _ai_stale, _um_shorten_passphrase, request.form.get('um_burn_file'), _report_enabled, _report_interval, _report_port, request.form.get('report_clients'), request.form.get('unit_time'), request.form.get('notes'), request.form.get('dash_url')) + server_add(request.form.get('server_name'), request.form.get('server_secret'), request.form.get('server_ip'), _port, request.form.get('global_path'), _global_ping_time, _global_max_missed, _global_use_acl, request.form.get('reg_acl'), request.form.get('sub_acl'), request.form.get('global_ts1_acl'), request.form.get('global_ts2_acl'), request.form.get('sub_file'), _ai_try_download, request.form.get('aliases_path'), request.form.get('peer_file'), request.form.get('tgid_file'), request.form.get('peer_url'), request.form.get('sub_url'), _ai_stale, _um_shorten_passphrase, request.form.get('um_burn_file'), _report_enabled, _report_interval, _report_port, request.form.get('report_clients'), request.form.get('unit_time'), request.form.get('notes'), request.form.get('dash_url'), request.form.get('public_notes')) content = '''

Server saved.

Redirecting in 3 seconds.

''' if request.args.get('save_mode') == 'edit': ## print(request.args.get('server')) - server_edit(request.args.get('server'), request.form.get('server_secret'), request.form.get('server_ip'), _port, request.form.get('global_path'), _global_ping_time, _global_max_missed, _global_use_acl, request.form.get('reg_acl'), request.form.get('sub_acl'), request.form.get('global_ts1_acl'), request.form.get('global_ts2_acl'), request.form.get('sub_file'), _ai_try_download, request.form.get('aliases_path'), request.form.get('peer_file'), request.form.get('tgid_file'), request.form.get('peer_url'), request.form.get('sub_url'), _ai_stale, _um_shorten_passphrase, request.form.get('um_burn_file'), _report_enabled, _report_interval, _report_port, request.form.get('report_clients'), request.form.get('unit_time'), request.form.get('notes'), request.form.get('dash_url')) + server_edit(request.args.get('server'), request.form.get('server_secret'), request.form.get('server_ip'), _port, request.form.get('global_path'), _global_ping_time, _global_max_missed, _global_use_acl, request.form.get('reg_acl'), request.form.get('sub_acl'), request.form.get('global_ts1_acl'), request.form.get('global_ts2_acl'), request.form.get('sub_file'), _ai_try_download, request.form.get('aliases_path'), request.form.get('peer_file'), request.form.get('tgid_file'), request.form.get('peer_url'), request.form.get('sub_url'), _ai_stale, _um_shorten_passphrase, request.form.get('um_burn_file'), _report_enabled, _report_interval, _report_port, request.form.get('report_clients'), request.form.get('unit_time'), request.form.get('notes'), request.form.get('dash_url'), request.form.get('public_notes')) content = '''

Server changed.

Redirecting in 3 seconds.

''' @@ -3033,6 +3049,11 @@ def create_app():  Notes:   + + Public Notes: +  + +

Global

@@ -3233,6 +3254,10 @@ def create_app():  Notes:   + + Public Notes: +  +

Global

diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index f49ea71..60965e4 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -39,9 +39,8 @@ Home -Talkgroups News - +Talkgroups {% if not call_or_get(current_user.is_authenticated) %} Register