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 'bug/api-bug-cleanup' into 'dev'

Browse Source 
Fix api v1 bug with list servers

See merge request crafty-controller/crafty-4!288
This commit is contained in:
Iain Powrie 2022-06-02 14:03:27 +00:00
commit e22cdc3da8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/classes/web/api_handler.py
View File

@ -5,6 +5,7 @@ import re
from app.classes.controllers.crafty_perms_controller import EnumPermissionsCrafty from app.classes.controllers.crafty_perms_controller import EnumPermissionsCrafty
from app.classes.controllers.server_perms_controller import EnumPermissionsServer from app.classes.controllers.server_perms_controller import EnumPermissionsServer
from app.classes.web.base_handler import BaseHandler from app.classes.web.base_handler import BaseHandler
from app.classes.models.management import DatabaseShortcuts
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
bearer_pattern = re.compile(r"^Bearer", flags=re.IGNORECASE) bearer_pattern = re.compile(r"^Bearer", flags=re.IGNORECASE)
@ -427,6 +428,13 @@ class ListServers(ApiHandler):
servers = self.controller.servers.get_authorized_servers( servers = self.controller.servers.get_authorized_servers(
user_obj["user_id"] user_obj["user_id"]
) )
page_servers = []
for server in servers:
if server not in page_servers:
page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object)
)
servers = page_servers
servers = [str(i) for i in servers] servers = [str(i) for i in servers]
self.return_response( self.return_response(