search 2

fet2020/search/forms.py

@@ -8,6 +8,8 @@ from intern.models import Etherpad
 from members.models import Member
 from posts.models import Post
 
+from .legacy import es_search
+
 
 class FetUserSearchForm(SearchForm):
     def search(self):
@@ -59,7 +61,14 @@ class FetUserSearchForm(SearchForm):
         for elem in sqs_member:
             results.append(elem.object)
 
-        return results + tmp_results
+        print(self.cleaned_data.get("q"))
+        print("+++++++++++++")
+        results2 = es_search(self.cleaned_data.get("q"))
+        print(results2)
+        print("-------------------")
+        print(results)
+
+        return results + tmp_results + results2
 
 
 class NonUserSearchForm(SearchForm):