Skip to content

Commit

Permalink
search by nn
Browse files Browse the repository at this point in the history
  • Loading branch information
james-otten committed Apr 12, 2024
1 parent d3c821b commit 02fc837
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
15 changes: 15 additions & 0 deletions src/meshapi/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,21 @@ class InstallAdmin(admin.ModelAdmin):
),
]

def get_search_results(self, request, queryset, search_term):
queryset, may_have_duplicates = super().get_search_results(
request,
queryset,
search_term,
)
try:
upper_search = search_term.upper()
if len(upper_search) > 2 and upper_search[:2] == "NN":
search_term_as_int = int(upper_search[2:])
queryset |= self.model.objects.filter(node_id=search_term_as_int)
except ValueError:
pass
return queryset, may_have_duplicates


class LinkAdminForm(forms.ModelForm):
class Meta:
Expand Down
9 changes: 9 additions & 0 deletions src/meshapi/tests/test_admin_search_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,12 @@ def test_search_device(self):

def test_search_node(self):
self._call("/admin/meshapi/node/?q=1", 200)

def test_search_install_by_nn(self):
self._call("/admin/meshapi/install/?q=nN1", 200)

def test_search_install_just_nn(self):
self._call("/admin/meshapi/install/?q=nN", 200)

def test_search_install_empty(self):
self._call("/admin/meshapi/install/?q=", 200)

0 comments on commit 02fc837

Please sign in to comment.