From a3c1d9e05143e0b490c79c6c94751a0dea17c354 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 14 Sep 2022 13:13:32 -0400 Subject: [PATCH 1/2] Fix typo in panel handler for unloaded config --- app/classes/web/panel_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 44844bbf..d32d74b5 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -549,7 +549,7 @@ class PanelHandler(BaseHandler): "log_path": server_temp_obj["log_path"], "executable": server_temp_obj["executable"], "execution_command": server_temp_obj["execution_command"], - "shutdown_timeout": server_obj["shutdown_timeout"], + "shutdown_timeout": server_temp_obj["shutdown_timeout"], "stop_command": server_temp_obj["stop_command"], "executable_update_url": server_temp_obj[ "executable_update_url" From bce7c6aa4fd080601561071960e0588f07b1eda3 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 19 Sep 2022 22:34:07 +0100 Subject: [PATCH 2/2] Update changelog !460 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f44f85d..e3c3e060 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ### New features TBD ### Bug fixes -- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab)) +- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/460)) - Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452)) - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453)) - Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))