From 146e9d7b607fc02ecf45c71fad871f2d8fdc7a5d Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 12 Apr 2023 10:32:40 -0400 Subject: [PATCH 1/2] Fix import loop detection. --- app/classes/web/server_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py index 8b533bdf..e0921ce4 100644 --- a/app/classes/web/server_handler.py +++ b/app/classes/web/server_handler.py @@ -333,7 +333,7 @@ class ServerHandler(BaseHandler): if import_type == "import_jar": if self.helper.is_subdir( - import_server_path, self.controller.project_root + self.controller.project_root, import_server_path ): self.redirect( "/panel/error?error=Loop Error: The selected path will cause" @@ -499,7 +499,7 @@ class ServerHandler(BaseHandler): if import_type == "import_jar": if self.helper.is_subdir( - import_server_path, self.controller.project_root + self.controller.project_root, import_server_path ): self.redirect( "/panel/error?error=Loop Error: The selected path will cause" -- GitLab From de106921bd2a6a2c9319acefaf75d390fadcb32c Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 14 May 2023 20:38:33 +0100 Subject: [PATCH 2/2] Update Changelog !575 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b669422..e08f4a99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ TBD - Fix pipelines failing to build from gitlab pre-defined variable deprecation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/582)) - Fix incompatible buildx provenance meta, causing digest issues on GL/DH container registries ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/582)) - Fix Auth'd servers in roles | Refine server ordering ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/574)) +- Fix import loop detection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/575)) ### Tweaks TBD ### Lang -- GitLab