#677: change Harvest TC selection to autocomplete, remove harvest_cle…

…ar_tcs.html as it's no longer needed

Seeder/harvests/forms.py

@@ -32,6 +32,9 @@ def __init__(self, *args, **kwargs):
     "custom_sources": autocomplete.ModelSelect2Multiple(
         url="source:source_autocomplete"
     ),
+    "topic_collections": autocomplete.ModelSelect2Multiple(
+        url="harvests:internal_collection_autocomplete",
+    ),
     **custom_seeds_widget,
 }
 

Seeder/harvests/templates/calendar.html

@@ -45,7 +45,6 @@ <h4 class="modal-title" id="myModalLabel">{% trans 'Add harvest' %}</h4>
                   {% bootstrap_form harvest_form %}
                   {% include "harvest_autoselect.html" %}
                   {% include "harvest_config_ajax.html" %}
-                  {% include "harvest_clear_tcs.html" %}
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Close' %}</button>

Seeder/harvests/templates/harvest_add_form.html

@@ -4,5 +4,4 @@
 {{ block.super }}
 {% include "harvest_autoselect.html" %}
 {% include "harvest_config_ajax.html" %}
-{% include "harvest_clear_tcs.html" %}
 {% endblock %}

Seeder/harvests/templates/harvest_edit_form.html

@@ -4,5 +4,4 @@
 {{ block.super }}
 {% include "harvest_autoselect.html" with editing=True %}
 {% include "harvest_config_ajax.html" %}
-{% include "harvest_clear_tcs.html" %}
 {% endblock %}

Seeder/harvests/urls.py

@@ -35,6 +35,9 @@ def to_url(self, value):
          name='internal_collection_urls'),
     path('<int:pk>/history', InternalCollectionHistory.as_view(),
          name='internal_collection_history'),
+    path('internal_collection_autocomplete',
+         InternalCollectionAutocomplete.as_view(),
+         name="internal_collection_autocomplete")
 ]
 
 # External Topic Collections

Seeder/harvests/views.py

@@ -1,8 +1,9 @@
 import time
 import re
 from datetime import date
-
+from dal import autocomplete
 import datetime
+from django.db.models import Q
 from django.urls import reverse
 from django.http import Http404
 from django.contrib import messages
@@ -548,6 +549,19 @@ class InternalCollectionHistory(InternalTCView, generic_views.HistoryView):
     """
     pass
 
+
+class InternalCollectionAutocomplete(autocomplete.Select2QuerySetView):
+    def get_queryset(self):
+        if not self.request.user.is_authenticated:
+            return models.TopicCollection.objects.none()
+        qs = models.TopicCollection.objects.all()
+        if self.q:
+            qs = qs.filter(
+                Q(title__icontains=self.q) |
+                Q(collection_alias__icontains=self.q)
+            )
+        return qs.distinct()
+
 # ========================== #
 # External Topic Collections #
 # ========================== #