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

fix: department filters #635

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: department filters #635

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
9 changes: 9 additions & 0 deletions dtable_events/utils/sql_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,15 @@ def __init__(self, table, statistic_type, statistic, username, id_in_org, curren
item['filter_term'] = current_user_department_ids
if filter_term == 'current_user_department_and_sub':
item['filter_term'] = current_user_department_and_sub_ids
if isinstance(filter_term, list):
if 'current_user_department' in filter_term or 'current_user_department_and_sub' in filter_term:
for i in range(len(filter_term)):
if filter_term[i] == 'current_user_department':
filter_term[i] = current_user_department_ids
elif filter_term[i] == 'current_user_department_and_sub':
filter_term[i] = current_user_department_and_sub_ids
flat_result = [item for sublist in filter_term for item in (sublist if isinstance(sublist, list) else [sublist])]
item['filter_term'] = list(set(flat_result))
self.filters = filters

filter_conjunction = statistic.get('filter_conjunction', 'and')
Expand Down
Loading