Combined contents of "Setting up SSH" into "Virtual Machines" panel. Added

[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 d0b15154a9cfd136c5c7433983cf61fda1b1fe14..fd78ddf84062e828ac72489d99398c05dec6c1e9 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -43,21 +43,14 @@ class CollectionsController < ApplicationController
   end
 
   def choose
-    # Always offer a Projects dropdown when choosing collections.
-    params[:by_project] = true
-
     params[:limit] ||= 40
 
-    filter = [['link_class','=','name'],
-              ['head_uuid','is_a','arvados#collection']]
-
-    if params[:project_uuid] and !params[:project_uuid].empty?
-      filter << ['tail_uuid', '=', params[:project_uuid]]
-    end
-
-    @objects = Link.filter(filter)
+    @filters += [['link_class','=','name'],
+                 ['head_uuid','is_a','arvados#collection']]
 
+    @objects = Link
     find_objects_for_index
+
     @name_links = @objects
 
     @objects = Collection.