there is probably a better way to do this but making it work for now

billimarie · Oct 5, 2020 · bd75cb8 · bd75cb8
1 parent 80808d9
commit bd75cb8
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/client/templates/sections/current-prosecutors/currentProsecutors.js b/client/templates/sections/current-prosecutors/currentProsecutors.js
@@ -34,9 +34,15 @@ Template.currentProsecutors.helpers({
     attorneys() {
         const selectedRoleFilters = Template.instance().state.get("selectedRoleFilters")
         const selectedRaceFilters = Template.instance().state.get("selectedRaceFilters")
-        return selectedRoleFilters.length > 0
-            ? Attorneys.find({"role": {$in: selectedRoleFilters}}).fetch()
-            : Attorneys.find().fetch()
+        if (selectedRoleFilters.length > 0 && selectedRaceFilters.length > 0) {
+            Attorneys.find({"role": {$in: selectedRoleFilters}, "race": {$in: selectedRaceFilters}}).fetch()
+        } else if (selectedRoleFilters.length > 0 && selectedRaceFilters.length === 0) {
+            Attorneys.find({"role": {$in: selectedRoleFilters}}).fetch()
+        } else if (selectedRoleFilters.length === 0 && selectedRaceFilters.length > 0) {
+            Attorneys.find({"race": {$in: selectedRaceFilters}}).fetch()
+        } else {
+            Attorneys.find().fetch()
+        }
     },
 });