From 0385ce511d322821742448af46fc35d36560f006 Mon Sep 17 00:00:00 2001 From: Luc Date: Fri, 2 Dec 2016 15:43:33 +0100 Subject: [PATCH] Missing update for JSON output --- esp3d/webinterface.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/esp3d/webinterface.cpp b/esp3d/webinterface.cpp index b0f2a4ac..a7565431 100644 --- a/esp3d/webinterface.cpp +++ b/esp3d/webinterface.cpp @@ -1320,11 +1320,13 @@ void handle_password() web_interface->GetIpWeb(KeysList, ValuesList); //mode web_interface->GetMode(KeysList, ValuesList); - //page title and filenames - web_interface->SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CHANGE_PASSWORD),F("password")); - //menu item - KeysList.add(FPSTR(KEY_MENU_ADMIN)); - ValuesList.add(FPSTR(VALUE_ACTIVE)); + if (!outputjson){ + //page title and filenames + web_interface->SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CHANGE_PASSWORD),F("password")); + //menu item + KeysList.add(FPSTR(KEY_MENU_ADMIN)); + ValuesList.add(FPSTR(VALUE_ACTIVE)); + } //check if it is a submission or a display smsg=""; @@ -1386,13 +1388,15 @@ void handle_password() web_interface->ProcessAlertError(KeysList, ValuesList, smsg, !outputjson); } else if (msg_alert_success) { web_interface->ProcessAlertSuccess(KeysList, ValuesList, smsg, !outputjson); - KeysList.add(FPSTR(KEY_SERVICE_PAGE)); - ValuesList.add(""); - //Add all green - KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS)); - ValuesList.add(FPSTR(VALUE_HAS_SUCCESS)); - KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2)); - ValuesList.add(FPSTR(VALUE_HAS_SUCCESS)); + if (!outputjson){ + KeysList.add(FPSTR(KEY_SERVICE_PAGE)); + ValuesList.add(""); + //Add all green + KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS)); + ValuesList.add(FPSTR(VALUE_HAS_SUCCESS)); + KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2)); + ValuesList.add(FPSTR(VALUE_HAS_SUCCESS)); + } } else