From 803d2e13f93e16808515a82665bcff37dfe266b4 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Thu, 5 Aug 2021 10:19:23 -0700 Subject: [PATCH] fix TG description, increase user notes char limit, change template --- web/app.py | 8 ++++---- web/templates/flask_user_layout.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/app.py b/web/app.py index cd6580d..91f9ab6 100644 --- a/web/app.py +++ b/web/app.py @@ -156,7 +156,7 @@ def create_app(): last_name = db.Column(db.String(100), nullable=False, server_default='') dmr_ids = db.Column(db.String(1000), nullable=False, server_default='') city = db.Column(db.String(100), nullable=False, server_default='') - notes = db.Column(db.String(100), nullable=False, server_default='') + notes = db.Column(db.String(2000), nullable=False, server_default='') #Used for initial approval initial_admin_approved = db.Column('initial_admin_approved', db.Boolean(), nullable=False, server_default='1') # Define the relationship to Role via UserRoles @@ -2003,7 +2003,6 @@ def create_app(): ## @login_required def tg_list(): cbl = BridgeList.query.filter_by(public_list=True).all() -## print(cbl) content = '''

 

Note: Talkgroups listed here may not be available on all servers. See Passphrase(s) for complete list of talkgroup availability per server.

@@ -2016,11 +2015,12 @@ def create_app():  Description ''' for i in cbl: + print(str(re.sub('<[^>]*>', '', i.description))[:50]) content = content + '''  ''' + i.bridge_name + '''  ''' + str(i.tg) + ''' - ''' + i.description[:60] + ''' + ''' + str(re.sub('<[^>]*>|\s\s+\s\s', '', i.description))[:50] + '''... ''' content = content + ''' @@ -5350,7 +5350,7 @@ def create_app(): ''' + str(i.bridge_name) + ''' ''' + str(i.public_list) + ''' -''' + str(i.description[:50]) + ''' +''' + str(re.sub('<[^>]*>|\s\s+\s\s', '', i.description))[:50] + '''... ''' + str(i.tg) + ''' diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index bcd450f..0474333 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -134,7 +134,7 @@
{% endblock %}