diff --git a/catalog/common/sites.py b/catalog/common/sites.py index 90c17470..7708863f 100644 --- a/catalog/common/sites.py +++ b/catalog/common/sites.py @@ -358,7 +358,8 @@ class SiteManager: sites = SiteManager.get_all_sites() if settings.SEARCH_SITES == ["*"] or not settings.SEARCH_SITES: return sites - return [s for s in sites if s.SITE_NAME.value in settings.SEARCH_SITES] + ss = {s.SITE_NAME.value: s for s in sites} + return [ss[s] for s in settings.SEARCH_SITES if s in ss] def crawl_related_resources_task(resource_pk): diff --git a/catalog/search/views.py b/catalog/search/views.py index 5368bd4e..201154bc 100644 --- a/catalog/search/views.py +++ b/catalog/search/views.py @@ -116,13 +116,14 @@ def search(request): tag = request.GET.get("tag", default="").strip() tag = Tag.deep_cleanup_title(tag, default="") p = int_(request.GET.get("page", default="1"), 1) + sites = [n.label for n in SiteName if n != SiteName.Unknown] if not (keywords or tag): return render( request, "search_results.html", { "items": None, - "sites": SiteName.labels, + "sites": sites, }, ) @@ -145,7 +146,7 @@ def search(request): "items": items, "dup_items": dup_items, "pagination": PageLinksGenerator(p, num_pages, request.GET), - "sites": SiteName.labels, + "sites": sites, "hide_category": hide_category, }, )