fix: Revert "feat: Support multiple OR'd search terms in sales-dashbo…

…ard" (#3739)
Flagsmith · Apr 9, 2024 · 7dd0c82 · 7dd0c82
1 parent 57e4ee7
commit 7dd0c82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/api/sales_dashboard/templates/sales_dashboard/base.html b/api/sales_dashboard/templates/sales_dashboard/base.html
@@ -16,7 +16,7 @@
   </head>
   <body>
     <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-      <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="/sales-dashboard/">Flagsmith</a>
+    <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="/sales-dashboard/">Flagsmith</a>
       <form method="get" action="{% url 'sales_dashboard:index' %}" class="form-inline w-100">
         <input class="form-control mr-sm-2 w-75" type="search" placeholder="Search by org name, email addresses or subscription ID. Separate multiple search terms with commas" aria-label="Search" name="search" value="{{ search }}">
         <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>

diff --git a/api/sales_dashboard/views.py b/api/sales_dashboard/views.py
@@ -61,16 +61,11 @@ def get_queryset(self):
 
         if self.request.GET.get("search"):
             search_term = self.request.GET["search"]
-            criteria = Q()
-            terms = search_term.split(",")
-            for t in terms:
-                term = t.strip()
-                criteria |= (
-                    Q(name__icontains=term)
-                    | Q(users__email__icontains=term)
-                    | Q(subscription__subscription_id=term)
-                )
-            queryset = queryset.filter(criteria)
+            queryset = queryset.filter(
+                Q(name__icontains=search_term)
+                | Q(users__email__icontains=search_term)
+                | Q(subscription__subscription_id=search_term)
+            )
 
         if self.request.GET.get("filter_plan"):
             filter_plan = self.request.GET["filter_plan"]