github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

Tidy more space with latest from master

pull/321/head
Tom Taylor 2022-05-23 14:38:51 +01:00 committed by GitHub
parent 92523d949e
commit 38178ab326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/sql.py
View File

@ -386,14 +386,12 @@ def select_user_groups_with_names(user_id, **kwargs):
if kwargs.get("all") is not None: if kwargs.get("all") is not None:
query = (UserGroups query = (UserGroups
.select(UserGroups.user_group_id, UserGroups.user_id, Groups.name) .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: else:
query = (UserGroups query = (UserGroups
.select(UserGroups.user_group_id, Groups.name) .select(UserGroups.user_group_id, Groups.name)
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id)) .join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
.where(UserGroups.user_id == user_id) .where(UserGroups.user_id == user_id))
)
try: try:
query_res = query.execute() query_res = query.execute()
except Exception as e: except Exception as e:
@ -2223,7 +2221,6 @@ def select_en_service():
return query_res return query_res
def select_status(smon_id): def select_status(smon_id):
try: try:
query_res = SMON.get(SMON.id == smon_id).status query_res = SMON.get(SMON.id == smon_id).status