X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/26114a84293ea3fbcc5ef4adcf7900060716e62c..e35fb48f1485a92a64a30efe8b1c43a179b70260:/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 737583a31e..a5ac21595e 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -5,6 +5,7 @@ class CollectionsController < ApplicationController def show_pane_list %w(Files Attributes Metadata Provenance_graph Used_by JSON API) end + def index if params[:search].andand.length.andand > 0 tags = Link.where(any: ['contains', params[:search]]) @@ -12,7 +13,19 @@ class CollectionsController < ApplicationController Collection.where(any: ['contains', params[:search]])). uniq { |c| c.uuid } else - @collections = Collection.limit(100) + if params[:limit] + limit = params[:limit].to_i + else + limit = 100 + end + + if params[:offset] + offset = params[:offset].to_i + else + offset = 0 + end + + @collections = Collection.limit(limit).offset(offset) end @links = Link.limit(1000). where(head_uuid: @collections.collect(&:uuid)) @@ -92,7 +105,7 @@ class CollectionsController < ApplicationController Link.where(tail_uuid: @sourcedata.keys).each do |link| if link.link_class == 'data_origin' @sourcedata[link.tail_uuid][:data_origins] ||= [] - @sourcedata[link.tail_uuid][:data_origins] << [link.name, link.head_kind, link.head_uuid] + @sourcedata[link.tail_uuid][:data_origins] << [link.name, link.head_uuid] end end Collection.where(uuid: @sourcedata.keys).each do |collection| @@ -100,17 +113,17 @@ class CollectionsController < ApplicationController @sourcedata[collection.uuid][:collection] = collection end end - + Collection.where(uuid: @object.uuid).each do |u| puts request - @prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg", + @prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg", {:request => request, - :direction => :top_down, + :direction => :bottom_up, :combine_jobs => :script_only}) rescue nil - @used_by_svg = ProvenanceHelper::create_provenance_graph(u.used_by, "used_by_svg", + @used_by_svg = ProvenanceHelper::create_provenance_graph(u.used_by, "used_by_svg", {:request => request, - :direction => :top_down, - :combine_jobs => :script_only, + :direction => :top_down, + :combine_jobs => :script_only, :pdata_only => true}) rescue nil end end