mirror of https://github.com/Aidaho12/haproxy-wi
Tidy more space with latest from master
parent
92523d949e
commit
38178ab326
|
@ -386,14 +386,12 @@ def select_user_groups_with_names(user_id, **kwargs):
|
|||
if kwargs.get("all") is not None:
|
||||
query = (UserGroups
|
||||
.select(UserGroups.user_group_id, UserGroups.user_id, Groups.name)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
|
||||
)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id)) )
|
||||
else:
|
||||
query = (UserGroups
|
||||
.select(UserGroups.user_group_id, Groups.name)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
|
||||
.where(UserGroups.user_id == user_id)
|
||||
)
|
||||
.where(UserGroups.user_id == user_id))
|
||||
try:
|
||||
query_res = query.execute()
|
||||
except Exception as e:
|
||||
|
@ -2223,7 +2221,6 @@ def select_en_service():
|
|||
return query_res
|
||||
|
||||
|
||||
|
||||
def select_status(smon_id):
|
||||
try:
|
||||
query_res = SMON.get(SMON.id == smon_id).status
|
||||
|
|
Loading…
Reference in New Issue