Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,6 @@ class MqttManagerConfig {
// Map of SETTING key that points to a pair of two strings. Pair.first is database key as string, Pair.second is default value.
static inline std::unordered_map<MQTT_MANAGER_SETTING, std::pair<std::string, std::string>> _setting_key_map = {
{MQTT_MANAGER_SETTING::IS_HOME_ASSISTANT_ADDON, {"is_home_assistant_addon", "false"}},
{MQTT_MANAGER_SETTING::OPTIMISTIC_MODE, {"optimistic_mode", "false"}},
Comment thread
tpanajott marked this conversation as resolved.
{MQTT_MANAGER_SETTING::MQTT_WAIT_TIME, {"mqtt_wait_time", "0"}},
{MQTT_MANAGER_SETTING::BUTTON_LONG_PRESS_TIME, {"button_long_press_time", "5000"}},
{MQTT_MANAGER_SETTING::CLOCK_US_STYLE, {"clock_us_style", "False"}},
{MQTT_MANAGER_SETTING::COLOR_TEMP_MAX, {"color_temp_max", "6000"}},
Expand Down
4 changes: 2 additions & 2 deletions docker/web/nspanelmanager/web/templates/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ <h3 class="block mb-2 text-sm font-medium">Entity update mode</h3>
<!-- Optimistic mode -->
<li class="w-full border-t sm:border-t-0 border-neutral">
<div class="flex items-center ps-3">
<input id="entity_update_mode_optimistic" type="radio" name="optimistic_mode" value="optimistic" {% if optimistic_mode == "True" %}checked{% endif %}
<input id="entity_update_mode_optimistic" type="radio" name="optimistic_mode" value="optimistic" {% if optimistic_mode|lower == "true" %}checked{% endif %}
class="w-4 h-4 radio radio-accent">
<label for="entity_update_mode_optimistic" class="w-full py-3 ms-2 text-sm font-medium">Optimistic</label>
</div>
Expand All @@ -404,7 +404,7 @@ <h3 class="block mb-2 text-sm font-medium">Entity update mode</h3>
<!-- Wait mode -->
<li class="w-full border-t sm:border-t-0 border-neutral">
<div class="flex items-center ps-3">
<input id="entity_update_mode_wait" type="radio" name="optimistic_mode" value="wait" {% if optimistic_mode == "False" %}checked{% endif %}
<input id="entity_update_mode_wait" type="radio" name="optimistic_mode" value="wait" {% if optimistic_mode|lower == "false" %}checked{% endif %}
class="w-4 h-4 radio radio-accent">
<label for="entity_update_mode_wait"
class="w-full py-3 ms-2 text-sm font-medium">Wait</label>
Expand Down
17 changes: 11 additions & 6 deletions docker/web/nspanelmanager/web/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -750,13 +750,16 @@ def save_settings(request):
set_setting_value(name="screensaver_mode", value=request.POST["screensaver_mode"])
set_setting_value(
name="show_screensaver_inside_temperature",
value=request.POST["show_screensaver_inside_temperature"],
value=request.POST.get("show_screensaver_inside_temperature", "True"),
)
set_setting_value(
name="show_screensaver_outside_temperature",
value=request.POST["show_screensaver_outside_temperature"],
value=request.POST.get("show_screensaver_outside_temperature", "True"),
)
set_setting_value(
name="turn_on_behavior",
value=request.POST.get("turn_on_behavior", "color_temp"),
)
set_setting_value(name="turn_on_behavior", value=request.POST["turn_on_behavior"])
set_setting_value(
name="max_live_log_messages", value=request.POST["max_live_log_messages"]
)
Expand All @@ -768,9 +771,11 @@ def save_settings(request):
)
set_setting_value(name="manager_address", value=request.POST["manager_address"])
set_setting_value(name="manager_port", value=request.POST["manager_port"])
set_setting_value(
name="optimistic_mode", value=request.POST["optimistic_mode"] == "optimistic"
)
if "optimistic_mode" in request.POST:
set_setting_value(
name="optimistic_mode",
value=request.POST["optimistic_mode"] == "optimistic",
)
set_setting_value(
name="all_rooms_status_backoff_time",
value=request.POST["all_rooms_status_backoff_time"],
Expand Down