tweak site name list
This commit is contained in:
parent
c186d7d6ed
commit
5f231861f1
2 changed files with 5 additions and 3 deletions
|
@ -358,7 +358,8 @@ class SiteManager:
|
||||||
sites = SiteManager.get_all_sites()
|
sites = SiteManager.get_all_sites()
|
||||||
if settings.SEARCH_SITES == ["*"] or not settings.SEARCH_SITES:
|
if settings.SEARCH_SITES == ["*"] or not settings.SEARCH_SITES:
|
||||||
return 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):
|
def crawl_related_resources_task(resource_pk):
|
||||||
|
|
|
@ -116,13 +116,14 @@ def search(request):
|
||||||
tag = request.GET.get("tag", default="").strip()
|
tag = request.GET.get("tag", default="").strip()
|
||||||
tag = Tag.deep_cleanup_title(tag, default="")
|
tag = Tag.deep_cleanup_title(tag, default="")
|
||||||
p = int_(request.GET.get("page", default="1"), 1)
|
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):
|
if not (keywords or tag):
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
"search_results.html",
|
"search_results.html",
|
||||||
{
|
{
|
||||||
"items": None,
|
"items": None,
|
||||||
"sites": SiteName.labels,
|
"sites": sites,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -145,7 +146,7 @@ def search(request):
|
||||||
"items": items,
|
"items": items,
|
||||||
"dup_items": dup_items,
|
"dup_items": dup_items,
|
||||||
"pagination": PageLinksGenerator(p, num_pages, request.GET),
|
"pagination": PageLinksGenerator(p, num_pages, request.GET),
|
||||||
"sites": SiteName.labels,
|
"sites": sites,
|
||||||
"hide_category": hide_category,
|
"hide_category": hide_category,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Reference in a new issue