From c58e4e3ebf291b361ed44e78ab7ad4510adebb62 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Tue, 4 Oct 2022 16:37:53 -0400 Subject: [PATCH 1/2] Clean up backup configs when deleting servers --- app/classes/controllers/servers_controller.py | 5 +++++ app/classes/models/management.py | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py index c1d5177c..b0a9044a 100644 --- a/app/classes/controllers/servers_controller.py +++ b/app/classes/controllers/servers_controller.py @@ -134,8 +134,13 @@ class ServersController(metaclass=Singleton): role_id = role.role_id role_data = RolesController.get_role_with_servers(role_id) role_data["servers"] = {server_id} + # Remove server id permissions from role PermissionsServers.delete_roles_permissions(role_id, role_data["servers"]) + # Remove roles from server PermissionsServers.remove_roles_of_server(server_id) + # Remove backup configs tied to server + self.management_helper.remove_backup_config(server_id) + # Finally remove server self.servers_helper.remove_server(server_id) @staticmethod diff --git a/app/classes/models/management.py b/app/classes/models/management.py index 67d1ff9c..c961f002 100644 --- a/app/classes/models/management.py +++ b/app/classes/models/management.py @@ -367,6 +367,10 @@ class HelpersManagement: } return conf + @staticmethod + def remove_backup_config(server_id): + Backups.delete().where(Backups.server_id == server_id).execute() + def set_backup_config( self, server_id: int, From 7df2ef51c1b0ce09660bf7593180286a977587dd Mon Sep 17 00:00:00 2001 From: Zedifus Date: Wed, 5 Oct 2022 22:38:36 +0100 Subject: [PATCH 2/2] Update changelog !480 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05cb4d75..94d9a52d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ TBD - Fix conditional issue with zip imports/uploads ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/476)) - Fix API Schedule updates ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/478)) - Add port constraint for all server creation & api ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/479)) +- Clean up backup configs when deleting servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/480)) ### Tweaks - Fix sidebar to not move when scrolling ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/475)) ### Lang