Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/loop-detection' into 'dev'

Browse Source 
Fix import loop detection.

See merge request crafty-controller/crafty-4!575
This commit is contained in:
Iain Powrie 2023-05-14 19:48:41 +00:00
commit 2d39214b4c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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

4
app/classes/web/server_handler.py
View File

@ -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"