Merge branch 'dev' into feature-permissions

src/documents/index.py

@@ -5,6 +5,7 @@ from contextlib import contextmanager
 
 from dateutil.parser import isoparse
 from django.conf import settings
+from documents.models import Comment
 from documents.models import Document
 from guardian.shortcuts import get_users_with_perms
 from whoosh import classify
@@ -50,6 +51,7 @@ def get_schema():
         path=TEXT(sortable=True),
         path_id=NUMERIC(),
         has_path=BOOLEAN(),
+        comments=TEXT(),
         owner=TEXT(),
         owner_id=NUMERIC(),
         has_owner=BOOLEAN(),
@@ -95,6 +97,7 @@ def open_index_searcher():
 def update_document(writer, doc):
     tags = ",".join([t.name for t in doc.tags.all()])
     tags_ids = ",".join([str(t.id) for t in doc.tags.all()])
+    comments = ",".join([str(c.comment) for c in Comment.objects.filter(document=doc)])
     users_with_perms = get_users_with_perms(
         doc,
         only_with_perms_in=["view_document"],
@@ -120,6 +123,7 @@ def update_document(writer, doc):
         path=doc.storage_path.name if doc.storage_path else None,
         path_id=doc.storage_path.id if doc.storage_path else None,
         has_path=doc.storage_path is not None,
+        comments=comments,
         owner=doc.owner.username if doc.owner else None,
         owner_id=doc.owner.id if doc.owner else None,
         has_owner=doc.owner is not None,
@@ -276,7 +280,7 @@ class DelayedFullTextQuery(DelayedQuery):
     def _get_query(self):
         q_str = self.query_params["query"]
         qp = MultifieldParser(
-            ["content", "title", "correspondent", "tag", "type"],
+            ["content", "title", "correspondent", "tag", "type", "comments"],
             self.searcher.ixreader.schema,
         )
         qp.add_plugin(DateParserPlugin())