From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 25 Jan 2023 17:58:36 +0000 (-0800)
Subject: Merge branch 'dev' into feature-permissions
X-Git-Tag: v1.14.0-beta.rc1~109^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d3feaebfdee97e9010028ec61111746e8a76ce6;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev' into feature-permissions
---

6d3feaebfdee97e9010028ec61111746e8a76ce6
diff --cc src/documents/views.py
index b2873694d9,e2807edff0..70936e4fc2
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@@ -501,17 -465,19 +501,19 @@@ class DocumentViewSet
          )
  
  
 -class SearchResultSerializer(DocumentSerializer):
 +class SearchResultSerializer(DocumentSerializer, PassUserMixin):
      def to_representation(self, instance):
          doc = Document.objects.get(id=instance["id"])
-         commentTerm = instance.results.q.subqueries[0]
-         comments = ",".join(
-             [
-                 str(c.comment)
-                 for c in Comment.objects.filter(document=instance["id"])
-                 if commentTerm.text in c.comment
-             ],
-         )
+         comments = ""
+         if hasattr(instance.results.q, "subqueries"):
+             commentTerm = instance.results.q.subqueries[0]
+             comments = ",".join(
+                 [
+                     str(c.comment)
+                     for c in Comment.objects.filter(document=instance["id"])
+                     if commentTerm.text in c.comment
+                 ],
+             )
          r = super().to_representation(doc)
          r["__search_hit__"] = {
              "score": instance.score,