diff --git a/scripts/dashboard/dashboard.py b/scripts/dashboard/dashboard.py index ebd8bff..67487e8 100644 --- a/scripts/dashboard/dashboard.py +++ b/scripts/dashboard/dashboard.py @@ -179,7 +179,7 @@ def aprs_to_latlon(x): minutes = x - 100*degrees return degrees + minutes/60 -def user_setting_write(dmr_id, input_ssid, input_icon, input_comment): +def user_setting_write(dmr_id, input_ssid, input_icon, input_comment, input_aprs): dmr_id = int(dmr_id) user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read()) new_dict = user_settings @@ -406,11 +406,11 @@ def user_settings(): ssid = user_settings[int(request.form.get('dmr_id'))][1]['ssid'] icon = user_settings[int(request.form.get('dmr_id'))][2]['icon'] comment = user_settings[int(request.form.get('dmr_id'))][3]['comment'] + pin = user_settings[int(request.form.get('dmr_id'))][4]['pin'] aprs_msg_status = str(user_settings[int(request.form.get('dmr_id'))][5]['APRS']) - try: - pin = user_settings[int(request.form.get('dmr_id'))][4]['pin'] - + if pin != '': + if ssid == '': ssid = aprs_ssid if icon == '': @@ -464,7 +464,7 @@ def user_settings(): """ - except: + if pin == '': user_result = """
""" diff --git a/scripts/dashboard/templates/about.html b/scripts/dashboard/templates/about.html index 503f177..a2208eb 100644 --- a/scripts/dashboard/templates/about.html +++ b/scripts/dashboard/templates/about.html @@ -7,7 +7,7 @@
@BB This is a test bulletin.
@N0CALL-15 A-This is a test.
@N0CALL-15 This is a test.
test@example.org E-This is a test.
test@example.org This is a test.
@N0CALL M-This is a test.
@REM MAIL
THIS IS AN EMERGENCY. @SOS
@NOTICE Server going down at 1800
@REM SOS