mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 06:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

unify public archive view

Browse source
This commit is contained in:
apkallum 2020-08-25 15:31:09 -04:00 • committed by Cristian
parent 3288f8579b
commit 5e8c115f3f
3 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
archivebox/core/urls.py
View file

@ -5,7 +5,7 @@ from django.views import static
from django.conf import settings from django.conf import settings
from django.views.generic.base import RedirectView from django.views.generic.base import RedirectView
from core.views import MainIndex, OldIndex, LinkDetails, PublicArchiveView, SearchResultsView, add_view from core.views import MainIndex, OldIndex, LinkDetails, PublicArchiveView, add_view
# print('DEBUG', settings.DEBUG) # print('DEBUG', settings.DEBUG)
@ -32,5 +32,4 @@ urlpatterns = [
path('index.json', static.serve, {'document_root': settings.OUTPUT_DIR, 'path': 'index.json'}), path('index.json', static.serve, {'document_root': settings.OUTPUT_DIR, 'path': 'index.json'}),
path('', MainIndex.as_view(), name='Home'), path('', MainIndex.as_view(), name='Home'),
path('public/', PublicArchiveView.as_view(), name='public-index'), path('public/', PublicArchiveView.as_view(), name='public-index'),
path('search_results/', SearchResultsView.as_view(), name='search-results'),
] ]

10
archivebox/core/views.py
View file

@ -123,6 +123,9 @@ class PublicArchiveView(ListView):
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
qs = super().get_queryset(**kwargs) qs = super().get_queryset(**kwargs)
query = self.request.GET.get('q')
if query:
qs = Snapshot.objects.filter(title__icontains=query)
for snapshot in qs: for snapshot in qs:
snapshot.icons = get_icons(snapshot) snapshot.icons = get_icons(snapshot)
return qs return qs
@ -134,13 +137,6 @@ class PublicArchiveView(ListView):
else: else:
return redirect(f'/admin/login/?next={self.request.path}') return redirect(f'/admin/login/?next={self.request.path}')
class SearchResultsView(PublicArchiveView):
def get_queryset(self):
query = self.request.GET.get('q')
results = Snapshot.objects.filter(title__icontains=query)
for snapshot in results:
snapshot.icons = get_icons(snapshot)
return results
def add_view(request): def add_view(request):
if PUBLIC_ADD_VIEW or request.user.is_authenticated: if PUBLIC_ADD_VIEW or request.user.is_authenticated:

2
archivebox/themes/default/core/snapshot_list.html
View file

@ -232,7 +232,7 @@
</div> </div>
</header> </header>
<br> <br>
<form action="{% url 'search-results' %}" method="get"> <form action="{% url 'public-index' %}" method="get">
<input name="q" type="text" placeholder="Search..."> <input name="q" type="text" placeholder="Search...">
<button type="submit">Search</button> <button type="submit">Search</button>
<button onclick="location.href='{% url 'public-index' %}'" type="button"> <button onclick="location.href='{% url 'public-index' %}'" type="button">