andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 01:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

process all modules before showing error

Browse Source
This commit is contained in:
proddy
2024-06-13 21:11:49 +02:00
parent c044e1a221
commit 28abf579e8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/web/WebModulesService.cpp
View File

@@ -74,19 +74,18 @@ void WebModules::read(WebModules & webModules, JsonObject root) {
// and then apply the enable/disable that is set by the user // and then apply the enable/disable that is set by the user
// This function is called when ems-esp boots and also on a save from the Modules web page // This function is called when ems-esp boots and also on a save from the Modules web page
StateUpdateResult WebModules::update(JsonObject root, WebModules & webModules) { StateUpdateResult WebModules::update(JsonObject root, WebModules & webModules) {
bool err = false;
if (root["modules"].is<JsonArray>()) { if (root["modules"].is<JsonArray>()) {
for (const JsonObject module : root["modules"].as<JsonArray>()) { for (const JsonObject module : root["modules"].as<JsonArray>()) {
auto key = module["key"].as<const char *>(); auto key = module["key"].as<const char *>();
auto license = module["license"].as<const char *>(); auto license = module["license"].as<const char *>();
auto enable = module["enabled"].as<bool>(); auto enable = module["enabled"].as<bool>();
if (!moduleLibrary.enable(key, license, enable)) { err &= moduleLibrary.enable(key, license, enable);
return StateUpdateResult::ERROR; // throw a 400 error
}
} }
} }
return StateUpdateResult::CHANGED; return err ? StateUpdateResult::ERROR : StateUpdateResult::CHANGED;
} }
} // namespace emsesp } // namespace emsesp