Merge branch 'master' into 3505-virtual-work-dir

[arvados.git] / apps / workbench / app / controllers / collections_controller.rb

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 5d1c49b8c5bb61fbd03ffdace1f8b3c32e539ea3..bea72a4274b9d8748bffbbde9a3e7937ef616879 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -43,9 +43,6 @@ class CollectionsController < ApplicationController
   end
 
   def choose
-    # Always offer a Projects dropdown when choosing collections.
-    params[:by_project] = true
-
     params[:limit] ||= 40
 
     @filters += [['link_class','=','name'],
@@ -58,6 +55,7 @@ class CollectionsController < ApplicationController
 
     @objects = Collection.
       filter([['uuid','in',@name_links.collect(&:head_uuid)]])
+    preload_links_for_objects @objects.to_a
     super
   end