diff --git a/front/css/pialert.css b/front/css/pialert.css index 0f44a43a..ec8f4003 100755 --- a/front/css/pialert.css +++ b/front/css/pialert.css @@ -738,9 +738,9 @@ height: 50px; width: 20%; } -#settingsPage input[readonly] { +input[readonly] { /* Apply styles to the readonly input */ - background-color: #646566; + background-color: #646566 !important; color: #000; cursor: not-allowed; } diff --git a/front/deviceDetails.php b/front/deviceDetails.php index cd4a3f92..d0a776ef 100755 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -1461,6 +1461,9 @@ function getDeviceData (readAllData=false) { $('#txtNetworkNodeMac').val (getDevicesListValue('mac', deviceData['dev_Network_Node_MAC_ADDR'] ,'name')); $('#txtNetworkNodeMac').attr ('data-mynodemac', deviceData['dev_Network_Node_MAC_ADDR']); $('#txtNetworkPort').val (deviceData['dev_Network_Node_port']); + // disabling network node configuration if root Internet node + $('#txtNetworkNodeMac').prop('readonly', mac == 'Internet' ); + $('#txtNetworkPort').prop('readonly', mac == 'Internet' ); $('#txtFirstConnection').val (deviceData['dev_FirstConnection']); $('#txtLastConnection').val (deviceData['dev_LastConnection']); diff --git a/pialert/__main__.py b/pialert/__main__.py index 46d8e4de..8709eade 100755 --- a/pialert/__main__.py +++ b/pialert/__main__.py @@ -157,8 +157,8 @@ def main (): check_internet_IP(db) # Update vendors once a week - if last_update_vendors + datetime.timedelta(days = 7) < loop_start_time: - last_update_vendors = loop_start_time + if conf.last_update_vendors + datetime.timedelta(days = 7) < loop_start_time: + conf.last_update_vendors = loop_start_time conf.cycle = 'update_vendors' mylog('verbose', ['[MAIN] cycle:',conf.cycle]) update_devices_MAC_vendors(db) diff --git a/pialert/publishers/apprise.py b/pialert/publishers/apprise.py index 148e9036..0f2ed35c 100755 --- a/pialert/publishers/apprise.py +++ b/pialert/publishers/apprise.py @@ -36,10 +36,6 @@ def send(msg: noti_struc): payloadData = msg.text # Define Apprise compatible payload (https://github.com/caronc/apprise-api#stateless-solution) - # payload = html - - # if conf.APPRISE_PAYLOAD == 'text': - # payload = text _json_payload = { "urls": conf.APPRISE_URL,