Merge branch 'master' of https://github.com/isb-cgc/ISB-CGC-Common in…

…to v2-remove-ca
isb-cgc · Aug 5, 2024 · 9be97f5 · 9be97f5
2 parents 766e2dd + 761efd4
commit 9be97f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cohorts/models.py b/cohorts/models.py
@@ -193,7 +193,7 @@ def get_filter_display_string(self, prefix=None):
 
         for fg in filter_groups:
             filters = fg.filter_set.all().get_filter_set_array()
-            group_filters = {x['name']: {'values': [attr_dvals.get(x['id'], {}).get(y, y) for y in x['values']], 'op': x['op']} for x in filters}
+            group_filters = {x['name']: x['values'] for x in filters}
 
             filter_sets.append(BigQuerySupport.build_bq_where_clause(
                 group_filters, join_with_space=True, field_prefix=prefix, encapsulated=False,

diff --git a/google_helpers/bigquery/bq_support.py b/google_helpers/bigquery/bq_support.py
@@ -481,5 +481,5 @@ def build_bq_where_clause(filters, join_with_space=False, comb_with='AND', field
                               type_schema=None, encapsulated=True, continuous_numerics=None, case_insens=True,
                               value_op='OR'):
 
-        build_bq_clause(filters, join_with_space, comb_with, field_prefix, type_schema, encapsulated,
+        return build_bq_clause(filters, join_with_space, comb_with, field_prefix, type_schema, encapsulated,
                         continuous_numerics, case_insens, value_op)