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/backup-restore-uuid' into 'dev'

Browse Source 
Fix backup restore failure

See merge request crafty-controller/crafty-4!736
This commit is contained in:
Iain Powrie 2024-04-06 19:57:37 +00:00
commit 33f55c24b1
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,7 +3,8 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
- Fix migrator issues when jumping versions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/734)) - Fix migrator issue when jumping versions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/734))
- Fix backend issue causing error when restoring backups in 4.3.x ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/736))
### Tweaks ### Tweaks
- Clean up remaining http handler references ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/733)) - Clean up remaining http handler references ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/733))
- Remove version disclosure on login page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/737)) - Remove version disclosure on login page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/737))

2
app/classes/controllers/server_perms_controller.py
View File

@ -47,7 +47,7 @@ class ServerPermsController:
new_server_id, new_server_id,
role.role_id, role.role_id,
PermissionsServers.get_permissions_mask( PermissionsServers.get_permissions_mask(
int(role.role_id), int(old_server_id) int(role.role_id), old_server_id
), ),
) )
# Permissions_Servers.add_role_server( # Permissions_Servers.add_role_server(

2
app/classes/shared/main_controller.py
View File

@ -1131,7 +1131,7 @@ class Controller:
server_obj.path = new_local_server_path server_obj.path = new_local_server_path
failed = False failed = False
for s in self.servers.failed_servers: for s in self.servers.failed_servers:
if int(s["server_id"]) == int(server.get("server_id")): if s["server_id"] == server.get("server_id"):
failed = True failed = True
if not failed: if not failed:
self.servers.update_server(server_obj) self.servers.update_server(server_obj)

2
app/classes/web/routes/api/servers/server/backups/backup/index.py
View File

@ -203,7 +203,7 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
except JobLookupError as e: except JobLookupError as e:
logger.info("No active tasks found for server: {e}") logger.info("No active tasks found for server: {e}")
self.controller.remove_server(server_id, True) self.controller.remove_server(server_id, True)
except Exception as e: except (FileNotFoundError, NotADirectoryError) as e:
return self.finish_json( return self.finish_json(
400, {"status": "error", "error": f"NO BACKUP FOUND {e}"} 400, {"status": "error", "error": f"NO BACKUP FOUND {e}"}
) )