Merge branch 'master' of https://github.com/AvocadoHQ/avocado

avo-hq · Jun 10, 2020 · 2305a99 · 2305a99
2 parents 8484af6 + e963b91
commit 2305a99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/avocado/app/resource.rb b/lib/avocado/app/resource.rb
@@ -185,7 +185,7 @@ def query_search(query: '', via_resource_name: , via_resource_id:)
           db_query = related_model.find(via_resource_id).public_send(self.resource_name_plural.downcase)
         end
 
-        self.search.each_with_index do |search_by, index|
+        [self.search].flatten.each_with_index do |search_by, index|
           query_string = "text(#{search_by}) ILIKE '%#{query}%'"
 
           if index == 0
@@ -195,7 +195,7 @@ def query_search(query: '', via_resource_name: , via_resource_id:)
           end
         end
 
-        db_query
+        db_query.select("#{:id}, #{title} as \"name\"")
       end
 
       def model

diff --git a/spec/dummy/app/services/avocado/resources/team.rb b/spec/dummy/app/services/avocado/resources/team.rb
@@ -3,7 +3,7 @@ module Resources
     class Team < Resource
       def initialize
         @title = :name
-        @search = :id
+        @search = [:id, :name]
       end
 
       fields do