From 68bc03d6a54e228064f8b8187639c0061703aa18 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Thu, 5 Jan 2023 21:26:32 +1100 Subject: [PATCH] check version&prompt before leave settings --- README.md | 2 +- back/report_template_new_version.html | 4 +++- dockerfiles/README.md | 2 +- front/settings.php | 33 +++++++++++++++++---------- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index c9b8c422..f16b7d12 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Scans for devices connected to your WIFI / LAN and alerts you if new and unknown # 🐳 Docker image -[![Docker](https://img.shields.io/github/actions/workflow/status/jokob-sk/Pi.Alert/docker.yml?branch=main&label=Build&logo=GitHub)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker.yml) +[![Docker](https://img.shields.io/github/actions/workflow/status/jokob-sk/Pi.Alert/docker_prod.yml?branch=main&label=Build&logo=GitHub)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker_prod.yml) [![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/Pi.Alert?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/Pi.Alert) [![Docker Size](https://img.shields.io/docker/image-size/jokobsk/pi.alert?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert) [![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/pi.alert?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert) diff --git a/back/report_template_new_version.html b/back/report_template_new_version.html index 06dabe14..92b87984 100755 --- a/back/report_template_new_version.html +++ b/back/report_template_new_version.html @@ -21,7 +21,9 @@ - 🆕 New version available 🆕 + + 🆕 New version available 🆕 + diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 1706647b..87bb6935 100755 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -1,4 +1,4 @@ -[![Docker](https://img.shields.io/github/actions/workflow/status/jokob-sk/Pi.Alert/docker.yml?branch=main&label=Build&logo=GitHub)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker.yml) +[![Docker](https://img.shields.io/github/actions/workflow/status/jokob-sk/Pi.Alert/docker_prod.yml?branch=main&label=Build&logo=GitHub)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker_prod.yml) [![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/Pi.Alert?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/Pi.Alert) [![Docker Size](https://img.shields.io/docker/image-size/jokobsk/pi.alert?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert) [![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/pi.alert?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert) diff --git a/front/settings.php b/front/settings.php index 2c1585ef..a3e2ecaf 100644 --- a/front/settings.php +++ b/front/settings.php @@ -99,12 +99,12 @@ CommitDB(); // text - textbox if($set['Type'] == 'text' ) { - $input = ''; + $input = ''; } // password - hidden text elseif ($set['Type'] == 'password') { - $input = ''; + $input = ''; } // readonly elseif ($set['Type'] == 'readonly') @@ -116,17 +116,17 @@ CommitDB(); { $checked = ""; if ($set['Value'] == "True") { $checked = "checked";}; - $input = ''; + $input = ''; } // integer - number input elseif ($set['Type'] == 'integer') { - $input = ''; + $input = ''; } // selecttext - dropdown elseif ($set['Type'] == 'selecttext') { - $input = ''; $values = createArray($set['Value']); $options = createArray($set['Options']); @@ -145,7 +145,7 @@ CommitDB(); // selectinteger - dropdown elseif ($set['Type'] == 'selectinteger') { - $input = ''; $values = createArray($set['Value']); $options = createArray($set['Options']); @@ -165,7 +165,7 @@ CommitDB(); // multiselect elseif ($set['Type'] == 'multiselect') { - $input = ''; $values = createArray($set['Value']); $options = createArray($set['Options']); @@ -187,7 +187,7 @@ CommitDB(); $input = $input. '
- +
'; // Add interface button $input = $input. @@ -275,12 +275,15 @@ CommitDB(); $('#ipMask').val(''); $('#ipInterface').val(''); + + settingsChanged(); } } // --------------------------------------------------------- function removeInterfaces() { + settingsChanged(); $('#SCAN_SUBNETS').empty(); } @@ -337,6 +340,8 @@ CommitDB(); // $("#result").html(data); // console.log(data); showModalOk ('Result', data ); + // Remove navigation prompt "Are you sure you want to leave..." + window.onbeforeunload = null; } }); } @@ -378,8 +383,15 @@ CommitDB(); }); } - // --------------------------------------------------------- + // --------------------------------------------------------- + function settingsChanged() + { + // Enable navigation prompt ... "Are you sure you want to leave..." + window.onbeforeunload = function() { + return true; + }; + } @@ -390,7 +402,4 @@ CommitDB(); // Show last time settings have been imported getParam("lastImportedTime", "Back_Settings_Imported", skipCache = true); - - -