fix: search in this folder only crashes (500) (#1366)

* Fix search in this folder only bug

* Typo fix

Author: fsbraun

filer/admin/folderadmin.py

@@ -297,16 +297,16 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
 
         if len(search_terms) > 0:
             if folder and limit_search_to_folder and not folder.is_root:
+                desc_folder_ids = folder.get_descendants_ids()
                 # Do not include current folder itself in search results.
-                folder_qs = folder.get_descendants(include_self=False)
+                folder_qs = Folder.objects.filter(pk__in=desc_folder_ids)
                 # Limit search results to files in the current folder or any
                 # nested folder.
-                file_qs = File.objects.filter(
-                    folder__in=folder.get_descendants(include_self=True))
+                file_qs = File.objects.filter(folder_id__in=desc_folder_ids + [folder.pk])
             else:
                 folder_qs = self.get_queryset(request)
                 file_qs = File.objects.all()
-            folder_qs = self.filter_folder(folder_qs, search_terms)
+            folder_qs = self.filter_folder(folder_qs, search_terms).prefetch_related("children", "all_files")
             file_qs = self.filter_file(file_qs, search_terms)
 
             show_result_count = True

filer/templates/admin/filer/folder/directory_listing.html

@@ -146,7 +146,7 @@ <h2>&nbsp;</h2>
                                 <input type="text" placeholder="{% trans 'Search' %}" class="filter-files-field js-filter-files" value="{{ search_string }}" name="q">
                                 <div class="filer-dropdown-container filer-dropdown-container-down">
                                     <a href="#" data-toggle="filer-dropdown" aria-expanded="false">
-                                        <span class="fa fa-caret-down cms-icon cms-filer-icon-caret-down"></span>
+                                        <span class="filer-icon filer-icon-caret-down fa fa-caret-down"></span>
                                     </a>
                                 </div>
                                 <ul class="filer-dropdown-menu filer-dropdown-menu-checkboxes">