From 74d52a0c619122f84afec2258c3de8f8b0b3f3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 26 Sep 2017 15:01:22 +0200 Subject: [PATCH] add confirmation messages to form saving --- front-end | 2 +- user/cgi_network.c | 2 +- user/cgi_persist.c | 8 ++++---- user/cgi_system.c | 2 +- user/cgi_term_cfg.c | 2 +- user/cgi_wifi.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/front-end b/front-end index d831d47..c846cff 160000 --- a/front-end +++ b/front-end @@ -1 +1 @@ -Subproject commit d831d47f5329e3bab11786942d941eb8ff4d1682 +Subproject commit c846cffedbd927433354f4fc2004154cd596916f diff --git a/user/cgi_network.c b/user/cgi_network.c index 3bc28b2..4cf4cc1 100644 --- a/user/cgi_network.c +++ b/user/cgi_network.c @@ -194,7 +194,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiNetworkSetParams(HttpdConnData *connData) os_timer_setfn(&timer, applyNetSettingsLaterCb, NULL); os_timer_arm(&timer, 1000, false); - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied."); } else { cgi_warn("Some WiFi settings did not validate, asking for correction"); diff --git a/user/cgi_persist.c b/user/cgi_persist.c index 61dee19..82a9d04 100644 --- a/user/cgi_persist.c +++ b/user/cgi_persist.c @@ -8,7 +8,7 @@ Cgi/template routines for configuring non-wifi settings #include "helpers.h" #include "cgi_logging.h" -#define SET_REDIR_SUC "/cfg/admin" +#define SET_REDIR_SUC "/cfg/system" static bool ICACHE_FLASH_ATTR verify_admin_pw(const char *pw) @@ -34,7 +34,7 @@ cgiPersistWriteDefaults(HttpdConnData *connData) persist_set_as_default(); - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=Default%20settings%20updated."); return HTTPD_CGI_DONE; } // if pw failed, show the same error as if it's wrong @@ -55,7 +55,7 @@ cgiPersistRestoreDefaults(HttpdConnData *connData) persist_restore_default(); - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=All%20settings%20restored%20to%20saved%20defaults."); return HTTPD_CGI_DONE; } @@ -71,6 +71,6 @@ cgiPersistRestoreHard(HttpdConnData *connData) // Defaults are not changed. persist_load_hard_default(); - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=All%20settings%20restored%20to%20factory%20defaults."); return HTTPD_CGI_DONE; } diff --git a/user/cgi_system.c b/user/cgi_system.c index 01fc61b..3e26c10 100755 --- a/user/cgi_system.c +++ b/user/cgi_system.c @@ -200,7 +200,7 @@ cgiSystemCfgSetParams(HttpdConnData *connData) sysconf_apply_settings(); persist_store(); - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied."); } else { cgi_warn("Some settings did not validate, asking for correction"); diff --git a/user/cgi_term_cfg.c b/user/cgi_term_cfg.c index 19ee825..56d06e6 100644 --- a/user/cgi_term_cfg.c +++ b/user/cgi_term_cfg.c @@ -367,7 +367,7 @@ cgiTermCfgSetParams(HttpdConnData *connData) screen_notifyChange(CHANGE_LABELS); } - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied."); } else { cgi_warn("Some settings did not validate, asking for correction"); diff --git a/user/cgi_wifi.c b/user/cgi_wifi.c index 0cab1a5..8f0f22f 100644 --- a/user/cgi_wifi.c +++ b/user/cgi_wifi.c @@ -535,7 +535,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData) httpdRedirect(connData, "/cfg/wifi/connecting"); } else { - httpdRedirect(connData, SET_REDIR_SUC); + httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied."); } } else { cgi_warn("Some WiFi settings did not validate, asking for correction");