Merge 4bad193 into fae18a7

benwbrum · Sep 18, 2019 · bd047fc · bd047fc
2 parents fae18a7 + 4bad193
commit bd047fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/models/collection.rb b/app/models/collection.rb
@@ -149,7 +149,7 @@ def search_works(search)
   end
 
   def self.search(search)
-    where("title LIKE ? OR slug LIKE ?", "%#{search}%", "%#{search}%")
+    where("title like ? OR slug LIKE ? OR owner_user_id in (select id from users where owner=1 and display_name like ?)", "%#{search}%", "%#{search}%", "%#{search}%")
   end
 
   def sections

diff --git a/app/models/document_set.rb b/app/models/document_set.rb
@@ -157,7 +157,7 @@ def search_collection_works(search)
   end
 
   def self.search(search)
-    where("title LIKE ? OR slug LIKE ?", "%#{search}%", "%#{search}%")
+    where("title like ? OR slug LIKE ? OR owner_user_id in (select id from users where owner=1 and display_name like ?)", "%#{search}%", "%#{search}%", "%#{search}%")
   end
 
   def default_orientation

diff --git a/app/views/dashboard/landing_page.html.slim b/app/views/dashboard/landing_page.html.slim
@@ -25,6 +25,9 @@
 
 .columns.project-list
   article.maincol
+    -if @search_results
+      -@search_results.each do |sr|
+        =link_to sr.title, collection_path(current_user.slug, sr.id) unless current_user.nil?
     -@owners.each do |owner|
       -if params[:search]
         -projects = @search_results.select{ |p| p.owner_user_id == owner.id}