Merge branch 'revert-cbd5d29f' into 'dev'

Revert "Fixed error with modelselect"

See merge request crafty-controller/crafty-commander!50
This commit is contained in:
Andrew 2021-08-22 03:30:54 +00:00
commit 61c242bafb

View File

@ -118,7 +118,7 @@ class Servers(Model):
class Meta: class Meta:
table_name = "servers" table_name = "servers"
database = database database = database
class Role_Servers(Model): class Role_Servers(Model):
role_id = ForeignKeyField(Roles, backref='role_server') role_id = ForeignKeyField(Roles, backref='role_server')
@ -301,7 +301,12 @@ class db_shortcuts:
user_roles = User_Roles.select().where(User_Roles.user_id == user_id) user_roles = User_Roles.select().where(User_Roles.user_id == user_id)
for r in user_roles: for r in user_roles:
user_servers.append(Role_Servers.select().where(Role_Servers.role_id == r.role_id)) user_servers.append(Role_Servers.select().where(Role_Servers.role_id == r.role_id))
return user_servers server_data = []
for u in user_servers:
server_data.append(db_helper.get_server_data_by_id(u.server_id))
return server_data
@staticmethod @staticmethod
def get_all_authorized_servers(user_id): def get_all_authorized_servers(user_id):