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.

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

BUG: Users table GUI fixes #994

Draft
wants to merge 1 commit into
base: v2.0.2
Choose a base branch
from
Draft
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions DSL/Resql/get-users-with-roles-by-role.sql
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ WHERE u.status <> 'deleted'
GROUP BY id_code
)
AND (:show_active_only <> true OR csa.status <> 'offline')
AND (:search_full_name IS NULL OR (
(u.first_name || ' ' || u.last_name) ILIKE '%' || :search_full_name || '%'
))
AND (:search_id_code IS NULL OR u.id_code ILIKE '%' || :search_id_code || '%')
AND (:search_display_name IS NULL OR u.display_name ILIKE '%' || :search_display_name || '%')
AND (:search_csa_title IS NULL OR u.csa_title ILIKE '%' || :search_csa_title || '%')
AND (:search_csa_email IS NULL OR u.csa_email ILIKE '%' || :search_csa_email || '%')
ORDER BY
CASE WHEN :sorting = 'name asc' THEN u.first_name END ASC,
CASE WHEN :sorting = 'name desc' THEN u.first_name END DESC,
Expand Down