Fix.

[redakcja.git] / src / catalogue / views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 7301580..097c549 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -1,8 +1,9 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+import json

 from django.apps import apps
 from django.apps import apps

-from django.db.models import Prefetch
+from django.db.models import Prefetch, Q

 from django.http import Http404, JsonResponse
 from django.urls import reverse
 from django.utils.formats import localize_input
 from django.http import Http404, JsonResponse
 from django.urls import reverse
 from django.utils.formats import localize_input


@@ -219,7 +220,29 @@ class ThemaChooser(Chooser):
                 res = res[0]['sub']
             return res
 
                 res = res[0]['sub']
             return res
 

-        for thema in self.queryset.all():
+        def apply_filter(filt):
+            if 'not' in filt:
+                return ~apply_filter(filt['not'])
+            if 'startswith' in filt:
+                q = None
+                for prefix in filt['startswith']:
+                    q2 = Q(code__startswith=prefix)
+                    if q:
+                        q |= q2
+                    else:
+                        q = q2
+                return q
+            assert False
+
+        qs = self.queryset
+        try:
+            filt = json.loads(request.GET.get('filter'))
+        except:
+            pass
+        else:
+            qs = qs.filter(apply_filter(filt))
+
+        for thema in qs:

             populate(thema)
 
         missing = list(getmissing(tree))
             populate(thema)
 
         missing = list(getmissing(tree))


@@ -383,23 +406,20 @@ def publish_collection(request, pk):
 
 
 @login_required
 
 
 @login_required

-def woblink_author_autocomplete(request):
-    shop = depot.models.Shop.objects.filter(shop='woblink').first()
-    if shop is None:
+def woblink_autocomplete(request, category):
+    site = depot.models.Site.objects.filter(site_type='woblink').first()
+    if site is None:

         return JsonResponse({})
         return JsonResponse({})

-    woblink = shop.get_publisher()
+    woblink = site.get_publisher()

     term = request.GET.get('term')
     if not term:
         return JsonResponse({})
     term = request.GET.get('term')
     if not term:
         return JsonResponse({})

-    response = woblink.session.get(
-        'https://publisher.woblink.com/author/autocomplete/' + term
-    ).json()
-    return JsonResponse({
-        "results": [
-            {
-                "id": item['autId'],
-                "text": item['autFullname'],
-            }
-            for item in response
-        ],
-    })
+
+    if category == 'author':
+        results = woblink.search_author_catalogue(term)
+    elif category == 'series':
+        results = woblink.search_series_catalogue(term)
+    else:
+        raise Http404
+
+    return JsonResponse({"results": results})