An open source, non-profit web search engine
Add a view for all curations
Daoud Clarkef83432a54d2c
diff --git a/mwmbl/models.py b/mwmbl/models.pyindex c11c129..3ecfc97 100644--- a/mwmbl/models.py+++ b/mwmbl/models.py@@ -54,7 +54,7 @@ class FlagCuration(models.Model):user = models.ForeignKey(MwmblUser, on_delete=models.CASCADE)timestamp = models.DateTimeField()- curation = models.ForeignKey(Curation, on_delete=models.CASCADE)+ curation = models.ForeignKey(Curation, on_delete=models.CASCADE, related_name="flag_curation_set")flag = models.CharField(max_length=20, choices=[(k, v) for k, v in FLAG_TYPES.items()])reason = models.CharField(max_length=300, blank=True)status = models.CharField(max_length=20, choices=[(k, v) for k, v in FLAG_STATUS.items()], default="PENDING")diff --git a/mwmbl/templates/base.html b/mwmbl/templates/base.htmlindex f0f35a0..289b85b 100644--- a/mwmbl/templates/base.html+++ b/mwmbl/templates/base.html@@ -8,7 +8,10 @@<meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0">+ {% block title %}{% include "title.html" %}+ {% endblock %}+<meta name="description" content="The free, open-source and non-profit search engine."><!-- Favicons -->diff --git a/mwmbl/templates/curation_item.html b/mwmbl/templates/curation_item.htmlnew file mode 100644index 0000000..2c3b787--- /dev/null+++ b/mwmbl/templates/curation_item.html@@ -0,0 +1,9 @@+{% load humanize %}+<ul>+ <li class="activity">+ <h1>+ {% if item.user %}{{ item.user }}{% else %}Anonymous{% endif %} made <a href="{% url 'curation' item.id %}">{{ item.num_changes | apnumber }}+ changes to {{ item.query }}</a> {{ item.timestamp | naturaltime }}{% if item.flag_curation_set.count > 0 %} (flagged){% endif %}.+ </h1>+ </li>+</ul>diff --git a/mwmbl/templates/home.html b/mwmbl/templates/home.htmlindex ff74850..00337f5 100644--- a/mwmbl/templates/home.html+++ b/mwmbl/templates/home.html@@ -43,14 +43,11 @@</ul>{% endif %}{% else %}+ <h1>Recent community activity</h1>+ <br>{% for item in activity %}- <ul>- <li class="activity">- <h1>- {% if item.user %}{{ item.user }}{% else %}Anonymous{% endif %} made <a href="{% url 'curation' item.id %}">{{ item.num_changes | apnumber }}- changes to {{ item.query }}</a> {{ item.timestamp | naturaltime }}.- </h1>- </li>- </ul>+ {% include "curation_item.html" %}{% endfor %}+ <br>+ <a href="{% url "curations" %}">All curations</a>{% endif %}diff --git a/mwmbl/templates/mwmbl/curations.html b/mwmbl/templates/mwmbl/curations.htmlnew file mode 100644index 0000000..171044b--- /dev/null+++ b/mwmbl/templates/mwmbl/curations.html@@ -0,0 +1,27 @@+{% extends "base.html" %}++{% block title %}+ <title>Mwmbl Community Curations</title>+{% endblock %}++{% block content %}++ <h1>Mwmbl Community Curations</h1>+ <br>+ {% for item in object_list %}+ {% include "curation_item.html" %}+ {% endfor %}++ <br>+ <div class="pagination">+ All curations, page:+ {% for page in page_obj.paginator.page_range %}+ {% if page == page_obj.number %}+ <span class="page-current">{{ page }}</span>+ {% else %}+ <span class="page-other"><a href="?page={{ page }}">{{ page }}</a></span>+ {% endif %}+ {% endfor %}+ </div>++{% endblock %}diff --git a/mwmbl/urls.py b/mwmbl/urls.pyindex 7445240..fbaf933 100644--- a/mwmbl/urls.py+++ b/mwmbl/urls.py@@ -21,7 +21,7 @@ import mwmbl.crawler.app as crawlerfrom mwmbl.search_setup import queued_batches, ranker, batch_cachefrom mwmbl.tinysearchengine import searchfrom mwmbl.views import home_fragment, add_url, index, approve, revert_current_curation, CurationDetailView, \- flag_curation, CurationFlagListView, flag_curation_update, domains_view, domain_view+ flag_curation, CurationFlagListView, flag_curation_update, domains_view, domain_view, CurationsViewurlpatterns = [path('admin/', admin.site.urls),@@ -32,8 +32,9 @@ urlpatterns = [path('app/add/', add_url, name="add_url"),path('app/approve/', approve, name="approve"),path('app/revert-current/', revert_current_curation, name="revert_current"),- path('app/curation/<int:pk>/', CurationDetailView.as_view(), name="curation"),- path('app/curation/<int:curation_id>/flag/', flag_curation, name="flag_curation"),+ path('app/curations/', CurationsView.as_view(), name="curations"),+ path('app/curations/<int:pk>/', CurationDetailView.as_view(), name="curation"),+ path('app/curations/<int:curation_id>/flag/', flag_curation, name="flag_curation"),path('app/flags/curation', CurationFlagListView.as_view(), name="flag_curation_list"),path('app/flags/curation/<int:flag_curation_id>/update', flag_curation_update, name="flag_curation_update"),path('app/domains/', domains_view, name="domains"),diff --git a/mwmbl/views.py b/mwmbl/views.pyindex d369d2f..c93c00c 100644--- a/mwmbl/views.py+++ b/mwmbl/views.py@@ -111,7 +111,7 @@ def _get_results_and_activity(request):activity = Noneelse:results = None- activity = Curation.objects.filter(flagcuration__isnull=True).order_by("-timestamp")[:8]+ activity = Curation.objects.filter(flag_curation_set__isnull=True).order_by("-timestamp")[:8]return activity, query, results@@ -356,6 +356,15 @@ def _get_document_state(validated: bool, source: str) -> Optional[DocumentState]return None+class CurationsView(ListView):+ paginate_by = 40+ model = Curation+ template_name = "mwmbl/curations.html"++ def get_queryset(self):+ return Curation.objects.prefetch_related('flag_curation_set').all().order_by("-timestamp")++class CurationDetailView(DetailView):model = Curation