mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'revert-cbd5d29f' into 'dev'
Revert "Fixed error with modelselect" See merge request crafty-controller/crafty-commander!50
This commit is contained in:
commit
61c242bafb
@ -118,7 +118,7 @@ class Servers(Model):
|
||||
class Meta:
|
||||
table_name = "servers"
|
||||
database = database
|
||||
|
||||
|
||||
|
||||
class Role_Servers(Model):
|
||||
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)
|
||||
for r in user_roles:
|
||||
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
|
||||
def get_all_authorized_servers(user_id):
|
||||
|
Loading…
Reference in New Issue
Block a user