Merge pull request #2595 from johannaengland/bugfix/room-search-relat…

…ed-names Fix backwards relation references in room search
Uninett · May 25, 2023 · b7f24ec · b7f24ec
2 parents 4672022 + 50de7f0
commit b7f24ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/nav/web/info/room/views.py b/python/nav/web/info/room/views.py
@@ -86,7 +86,7 @@ def search(request):
             titles.append(("Search for %s" % request.GET['query'],))
             rooms = process_searchform(searchform)
             for room in rooms:
-                room.netboxes = filter_netboxes(room)
+                room.filtered_netboxes = filter_netboxes(room)
     else:
         searchform = RoomSearchForm()
 
@@ -111,7 +111,7 @@ def process_searchform(form):
         return Room.objects.filter(
             Q(id__icontains=query)
             | Q(description__icontains=query)
-            | Q(child_locations__id__icontains=query)
+            | Q(location__id__icontains=query)
         ).order_by("id")
 
 

diff --git a/python/nav/web/templates/info/room/base.html b/python/nav/web/templates/info/room/base.html
@@ -45,7 +45,7 @@ <h3>Room search</h3>
                   {{ room.description }}
                 </td>
                 <td>
-                  {{ room.netboxes.count }}
+                  {{ room.filtered_netboxes.count }}
                 </td>
               </tr>
             {% endfor %}