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

Add Support for MVC

Browse Source 
Merge branch 'dev-Silversthorn-MVC' into 'dev'
This commit is contained in:
Silversthorn 2021-09-29 19:52:43 +00:00
commit c6389f14b3
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/classes/controllers/roles_controller.py
View File

@ -70,7 +70,8 @@ class Roles_Controller:
@staticmethod
def remove_role(role_id):
server_permissions.delete_roles_permissions(role_id)
role_data = Roles_Controller.get_role_with_servers(role_id)
server_permissions.delete_roles_permissions(role_id, role_data['servers'])
users_helper.remove_roles_from_role_id(role_id)
return roles_helper.remove_role(role_id)

9
app/classes/controllers/servers_controller.py
View File

@ -1,3 +1,4 @@
from app.classes.controllers.roles_controller import Roles_Controller
import os
import time
import logging
@ -38,10 +39,10 @@ class Servers_Controller:
@staticmethod
def remove_server(server_id):
roles_list = server_permissions.get_roles_from_server(server_id)
for role_id in roles_list:
server_permissions.delete_roles_permissions(role_id)
users_helper.remove_roles_from_role_id(role_id)
roles_helper.remove_role(role_id)
for role in roles_list:
role_id = role.role_id
role_data = Roles_Controller.get_role_with_servers(role_id)
server_permissions.delete_roles_permissions(role_id, role_data['servers'])
server_permissions.remove_roles_of_server(server_id)
servers_helper.remove_server(server_id)

5
app/classes/models/server_permissions.py
View File

@ -124,8 +124,9 @@ class Permissions_Servers:
@staticmethod
def get_role_permissions_list(role_id):
permissions_mask = ''
role_server = Role_Servers.select().where(Role_Servers.role_id == role_id).execute()
permissions_mask = '00000000'
role_server = Role_Servers.get_or_none(role_id)# select().where(Role_Servers.role_id == role_id).execute()
if role_server is not None:
permissions_mask = role_server[0].permissions
permissions_list = server_permissions.get_permissions(permissions_mask)
return permissions_list