Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hotfix/fix-admin-listing #284

Merged
merged 1 commit into from
Apr 23, 2024
Merged

hotfix/fix-admin-listing #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions apcd-cms/src/apps/utils/apcd_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def get_users():
port=APCD_DB['port'],
sslmode='require'
)
query = """SELECT
query = """SELECT
users.role_id,
users.user_id,
users.user_email,
Expand All @@ -33,11 +33,11 @@ def get_users():
users.active,
users.user_number,
roles.role_name
FROM users
NATURAL JOIN roles
LEFT JOIN submitter_users ON users.user_id = submitter_users.user_id
AND users.user_number = submitter_users.user_number
LEFT JOIN submitters on submitter_users.submitter_id = submitters.submitter_id
FROM users
LEFT JOIN roles on roles.role_id = users.role_id
LEFT JOIN submitter_users ON users.user_id = submitter_users.user_id
AND users.user_number = submitter_users.user_number
LEFT JOIN submitters on submitter_users.submitter_id = submitters.submitter_id
ORDER BY submitters.entity_name ASC;
"""
cur = conn.cursor()
Expand Down