2884: Selecting folders works for run pipeline dialog. Increased page size

from 20 items to 40 items.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 02b9501e9388f6f8ff1ea5e97e28c5d438504dbc..d7ffd9c792420396b9251d15d103014330b5a93e 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -145,8 +145,13 @@ class ApplicationController < ActionController::Base
   end
 
   def choose
-    params[:limit] ||= 20
-    find_objects_for_index if !@objects
+    params[:limit] ||= 40
+    if !@objects
+      if params[:project_uuid] and !params[:project_uuid].empty?
+        @objects = Group.find(params[:project_uuid]).contents({:filters => [['uuid', 'is_a', "arvados\##{ArvadosApiClient.class_kind(model_class)}"]]})
+      end
+      find_objects_for_index if !@objects
+    end
     respond_to do |f|
       if params[:partial]
         f.json {

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 593b3f83c1f18f3378e4aaa5ea994c964f679ba7..2ca5929510af2086371ae9bca8618a68e111d434 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -43,7 +43,7 @@ class CollectionsController < ApplicationController
   end
 
   def choose
-    params[:limit] ||= 20
+    params[:limit] ||= 40
 
     filter = [['link_class','=','name'],
               ['head_uuid','is_a','arvados#collection']]

diff --git a/apps/workbench/app/views/application/_choose.js.erb b/apps/workbench/app/views/application/_choose.js.erb
index 14de170ff315b5970b1c2388c4b240aab177033d..1936bdc4de024ba77d5c5233ac264884160fdeac 100644 (file)
--- a/apps/workbench/app/views/application/_choose.js.erb
+++ b/apps/workbench/app/views/application/_choose.js.erb
@@ -7,10 +7,11 @@ $('body > .modal-container .modal .modal-footer .btn-primary').
     data('action-data', <%= raw params[:action_data] %>);
 $(".chooser-show-project").on("click", function() {
   $("#choose-scroll").html("<%=j image_tag 'ajax-loader.gif' %>");
+  $(".modal-dialog-preview-pane").html('');
   var t = $(this);
   var d = {
       partial: true,
-      multiple: <%= multiple %>
+      multiple: <%= multiple || "false" %>
     };
   if (t.attr("data-project-uuid") != null) {
     d.project_uuid = t.attr("data-project-uuid");

diff --git a/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb b/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb
index 5cec6829c1e55ac1efa12b4a13f3632843b6477f..9aebd695bf681cb25214bbeab566a45444d9d5f1 100644 (file)
--- a/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb
@@ -1,11 +1,8 @@
 <% @objects.each do |object| %>
-  <div class="row filterable selectable <%= 'multiple' if multiple %>" data-object-uuid="<%= object.uuid %>" data-preview-href="<%= url_for object %>?tab_pane=Components">
+  <div class="row filterable selectable <%= 'multiple' if multiple %>" data-object-uuid="<%= object.uuid %>" data-preview-href="<%= url_for object %>?tab_pane=chooser_preview">
     <div class="col-sm-12" style="overflow-x:hidden">
       <i class="fa fa-fw fa-gear"></i>
       <%= object.name %>
     </div>
-    <div class="col-sm-11 col-sm-push-1 arv-description-in-table">
-      <%= object.description %>
-    </div>
   </div>
 <% end %>

diff --git a/apps/workbench/app/views/pipeline_templates/_show_chooser_preview.html.erb b/apps/workbench/app/views/pipeline_templates/_show_chooser_preview.html.erb
new file mode 100644 (file)
index 0000000..f8c65ba
--- /dev/null
+++ b/apps/workbench/app/views/pipeline_templates/_show_chooser_preview.html.erb
@@ -0,0 +1,4 @@
+<div class="col-sm-11 col-sm-push-1 arv-description-in-table">
+  <%= @object.description %>
+</div>
+<%= render partial: 'show_components' %>

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index d7b330df9a70d5a7f5e1eee926e13500ed8a5d96..da82e81ef81374e39994b08a27518e3f60de84e6 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -24,9 +24,6 @@ class Arvados::V1::GroupsController < ApplicationController
      Job, PipelineInstance, PipelineTemplate,
      Collection,
      Human, Specimen, Trait].each do |klass|
-      if params[:object_kind] and klass.kind != params[:object_kind]
-        continue
-      end
       @objects = klass.readable_by(*@read_users)
       cond_sql = "#{klass.table_name}.owner_uuid = ?"
       cond_params = [@object.uuid]