Merge branch 'dev' into feature-permissions

src/documents/views.py

@@ -504,14 +504,16 @@ class DocumentViewSet(
 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,

src/paperless/version.py

@@ -1,7 +1,7 @@
 from typing import Final
 from typing import Tuple
 
-__version__: Final[Tuple[int, int, int]] = (1, 11, 3)
+__version__: Final[Tuple[int, int, int]] = (1, 12, 0)
 # Version string like X.Y.Z
 __full_version_str__: Final[str] = ".".join(map(str, __version__))
 # Version string like X.Y