Skip to content

Commit

Permalink
empty json instead of "no entries"
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDvP committed Sep 19, 2023
1 parent 951e706 commit 4824152
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/analogsensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ void AnalogSensor::publish_values(const bool force) {
// searches by name
bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) const {
if (sensors_.empty()) {
output["message"] = "no entries";
// output["message"] = "no entries";
return true;
}
// make a copy of the string command for parsing
Expand Down Expand Up @@ -687,7 +687,7 @@ bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const i
// returns false if there are no sensors
bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject & output) const {
if (sensors_.empty()) {
output["message"] = "no entries";
// output["message"] = "no entries";
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/temperaturesensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ bool TemperatureSensor::command_commands(const char * value, const int8_t id, Js
// returns false if there are no sensors
bool TemperatureSensor::command_info(const char * value, const int8_t id, JsonObject & output) {
if (sensors_.empty()) {
output["message"] = "no entries";
// output["message"] = "no entries";
return true;
}

Expand All @@ -390,7 +390,7 @@ bool TemperatureSensor::command_info(const char * value, const int8_t id, JsonOb
// called from emsesp.cpp, similar to the emsdevice->get_value_info
bool TemperatureSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) {
if (sensors_.empty()) {
output["message"] = "no entries";
// output["message"] = "no entries";
return true;
}
// make a copy of the string command for parsing
Expand Down
2 changes: 1 addition & 1 deletion src/web/WebCustomEntityService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ bool WebCustomEntityService::get_value_info(JsonObject & output, const char * cm
// if no entries, return a message instead of an error
// https://github.com/emsesp/EMS-ESP32/issues/1297
if (customEntityItems->size() == 0) {
output["message"] = "no entries";
// output["message"] = "no entries";
return true;
}
if (strlen(cmd) == 0 || Helpers::toLower(cmd) == F_(values) || Helpers::toLower(cmd) == F_(info)) {
Expand Down
2 changes: 1 addition & 1 deletion src/web/WebSchedulerService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ bool WebSchedulerService::get_value_info(JsonObject & output, const char * cmd)
return true;
}
if (scheduleItems->size() == 0) {
output["message"] = "no entries";
// output["message"] = "no entries";
return true;
}
if (strlen(cmd) == 0 || Helpers::toLower(cmd) == F_(values) || Helpers::toLower(cmd) == F_(info)) {
Expand Down

0 comments on commit 4824152

Please sign in to comment.