]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'dev' into feature-permissions
authorMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Wed, 25 Jan 2023 17:58:36 +0000 (09:58 -0800)
committerMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Wed, 25 Jan 2023 17:58:36 +0000 (09:58 -0800)
1  2 
docs/usage.md
src/documents/views.py

diff --cc docs/usage.md
Simple merge
index b2873694d93a17f95f9d81feba5a0562f8bfeca1,e2807edff02f24bc3f32778e75d71df6bac47922..70936e4fc24894cf352afb90295677beee681ba9
@@@ -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,