Merge pull request #264 from Xpirix/improve_search_feature

Enhance search functionality

Author: Xpirix

qgis-app/custom_haystack_urls.py

@@ -25,7 +25,13 @@ def build_form(self, form_kwargs=None):
             sqs5 = SearchQuerySet().filter(
                 package_name_auto=self.request.GET.get("q", "")
             )
-            form_kwargs["searchqueryset"] = sqs1 | sqs2 | sqs3 | sqs4 | sqs5
+            sqs6 = SearchQuerySet().filter(
+                author_auto=self.request.GET.get("q", "")
+            )
+            sqs7 = SearchQuerySet().filter(
+                created_by_auto=self.request.GET.get("q", "")
+            )
+            form_kwargs["searchqueryset"] = sqs1 | sqs2 | sqs3 | sqs4 | sqs5 | sqs6 | sqs7
 
         return super(SearchWithRequest, self).build_form(form_kwargs)
 

qgis-app/plugins/search_indexes.py

@@ -11,6 +11,16 @@ class PluginIndex(indexes.SearchIndex, indexes.Indexable):
     description_auto = indexes.EdgeNgramField(model_attr="description")
     about_auto = indexes.EdgeNgramField(model_attr="about", default="")
     package_name_auto = indexes.EdgeNgramField(model_attr="package_name", default="")
+    author_auto = indexes.EdgeNgramField(model_attr="author", default="")
+    created_by_auto = indexes.EdgeNgramField()
+
+    def prepare_created_by_auto(self, obj):
+        parts = [
+            obj.created_by.username,
+            obj.created_by.first_name,
+            obj.created_by.last_name,
+        ]
+        return " ".join(filter(None, parts))
 
     def get_model(self):
         return Plugin

qgis-app/templates/search/indexes/plugins/plugin_text.txt

@@ -2,5 +2,7 @@
 {{ object.description }}
 {{ object.package_name }}
 {{ object.created_by.username }}
+{{ object.created_by.first_name }}
+{{ object.created_by.last_name }}
 {{ object.author }}
 {% for tag in object.tags.all %}{{ tag }} {% endfor %}