GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-14 04:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Missing update for JSON output

Browse Source
This commit is contained in:
Luc 2016-12-02 15:43:33 +01:00
parent 2a2dbf0d55
commit 0385ce511d
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esp3d/webinterface.cpp
View File

@ -1320,11 +1320,13 @@ void handle_password()
web_interface->GetIpWeb(KeysList, ValuesList); web_interface->GetIpWeb(KeysList, ValuesList);
//mode //mode
web_interface->GetMode(KeysList, ValuesList); web_interface->GetMode(KeysList, ValuesList);
if (!outputjson){
//page title and filenames //page title and filenames
web_interface->SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CHANGE_PASSWORD),F("password")); web_interface->SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CHANGE_PASSWORD),F("password"));
//menu item //menu item
KeysList.add(FPSTR(KEY_MENU_ADMIN)); KeysList.add(FPSTR(KEY_MENU_ADMIN));
ValuesList.add(FPSTR(VALUE_ACTIVE)); ValuesList.add(FPSTR(VALUE_ACTIVE));
}
//check if it is a submission or a display //check if it is a submission or a display
smsg=""; smsg="";
@ -1386,6 +1388,7 @@ void handle_password()
web_interface->ProcessAlertError(KeysList, ValuesList, smsg, !outputjson); web_interface->ProcessAlertError(KeysList, ValuesList, smsg, !outputjson);
} else if (msg_alert_success) { } else if (msg_alert_success) {
web_interface->ProcessAlertSuccess(KeysList, ValuesList, smsg, !outputjson); web_interface->ProcessAlertSuccess(KeysList, ValuesList, smsg, !outputjson);
if (!outputjson){
KeysList.add(FPSTR(KEY_SERVICE_PAGE)); KeysList.add(FPSTR(KEY_SERVICE_PAGE));
ValuesList.add(""); ValuesList.add("");
//Add all green //Add all green
@ -1394,6 +1397,7 @@ void handle_password()
KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2)); KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2));
ValuesList.add(FPSTR(VALUE_HAS_SUCCESS)); ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
} }
}
else else