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

fix: Revert "feat: Support multiple OR'd search terms in sales-dashboard" #3739

Merged
merged 1 commit into from
Apr 9, 2024
Merged

fix: Revert "feat: Support multiple OR'd search terms in sales-dashboard" #3739

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion api/sales_dashboard/templates/sales_dashboard/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 5 additions & 10 deletions api/sales_dashboard/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down