From e435292a52e96e1ef8eaec2cc55bb35919a203da Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 17 Jun 2022 00:58:18 -0400 Subject: [PATCH 1/5] Fix blank server_detail page for general users --- app/classes/web/panel_handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 295fbded..bb44138f 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -183,6 +183,7 @@ class PanelHandler(BaseHandler): logger.debug(f'User {exec_user["user_id"]} does not have permission') self.redirect("/panel/error?error=Invalid Server ID") return None + return server_id # Server fetching, spawned asynchronously # TODO: Make the related front-end elements update with AJAX From 56a9002a98a5f22069b03368f5cc34da89de0fb0 Mon Sep 17 00:00:00 2001 From: Iain Powrie Date: Fri, 17 Jun 2022 14:24:18 +0000 Subject: [PATCH 2/5] Clobber changelog for hotfix --- CHANGELOG.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aee550bc..6326fbab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,9 @@ # Changelog -## [4.0.3] - TBD +## [4.0.2-hotfix1] - 2022/06/17 -### New features - TBD - -### Bug fixes -TBD - -### Tweaks -TBD +### Crit Bug fixes +Fix blank server_detail page for general users ## [4.0.2] - 2022/06/16 From 4d0afd015de427411d45cfa82ee4744d7926f357 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Fri, 17 Jun 2022 15:30:48 +0100 Subject: [PATCH 3/5] Add missing MR link from hotfix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6326fbab..ed505f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## [4.0.2-hotfix1] - 2022/06/17 ### Crit Bug fixes -Fix blank server_detail page for general users +Fix blank server_detail page for general users ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/358)) ## [4.0.2] - 2022/06/16 From e204287bc5e7d14f521fcc31ae0ab775331d9ef5 Mon Sep 17 00:00:00 2001 From: Iain Powrie Date: Fri, 17 Jun 2022 14:38:33 +0000 Subject: [PATCH 4/5] 4.0.2-hotfix1 Fix blank server_detail page for general users See merge request !358 --- CHANGELOG.md | 5 +++++ app/classes/web/panel_handler.py | 1 + 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 831e44e8..ed505f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [4.0.2-hotfix1] - 2022/06/17 + +### Crit Bug fixes +Fix blank server_detail page for general users ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/358)) + ## [4.0.2] - 2022/06/16 ### New features diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 295fbded..bb44138f 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -183,6 +183,7 @@ class PanelHandler(BaseHandler): logger.debug(f'User {exec_user["user_id"]} does not have permission') self.redirect("/panel/error?error=Invalid Server ID") return None + return server_id # Server fetching, spawned asynchronously # TODO: Make the related front-end elements update with AJAX From f73faf3e5b2bd4279742af2780d2dc09e2e0c73b Mon Sep 17 00:00:00 2001 From: Zedifus Date: Fri, 17 Jun 2022 15:41:08 +0100 Subject: [PATCH 5/5] Reinstate changelog prior to hotfix clobber --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed505f98..f9f61e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [4.0.3] - TBD + +### New features + TBD + +### Bug fixes +TBD + +### Tweaks +TBD + ## [4.0.2-hotfix1] - 2022/06/17 ### Crit Bug fixes