X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e24edb1d9624b6aed38464c70cab5027586abbc..7daa6c8ccfc68ec189b42522fa1481b7c31174a8:/apps/workbench/app/controllers/projects_controller.rb diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb index 01ab89b910..108cb601dd 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -79,28 +79,14 @@ class ProjectsController < ApplicationController end @objects = @object.contents(limit: 50, include_linked: true, + filters: params[:filters], offset: params[:offset] || 0) @share_links = Link.filter([['head_uuid', '=', @object.uuid], ['link_class', '=', 'permission']]) @logs = Log.limit(10).filter([['object_uuid', '=', @object.uuid]]) - @objects_and_names = [] - @objects.each do |object| - if !(name_links = @objects.links_for(object, 'name')).empty? - name_links.each do |name_link| - @objects_and_names << [object, name_link] - end - elsif object.respond_to? :name - @objects_and_names << [object, object] - else - @objects_and_names << [object, - Link.new(owner_uuid: @object.uuid, - tail_uuid: @object.uuid, - head_uuid: object.uuid, - link_class: "name", - name: "")] - end - end + @objects_and_names = get_objects_and_names @objects + if params[:partial] respond_to do |f| f.json { @@ -131,4 +117,27 @@ class ProjectsController < ApplicationController @updates = params['project'] super end + + helper_method :get_objects_and_names + def get_objects_and_names(objects) + objects_and_names = [] + objects.each do |object| + if !(name_links = objects.links_for(object, 'name')).empty? + name_links.each do |name_link| + objects_and_names << [object, name_link] + end + elsif object.respond_to? :name + objects_and_names << [object, object] + else + objects_and_names << [object, + Link.new(owner_uuid: @object.uuid, + tail_uuid: @object.uuid, + head_uuid: object.uuid, + link_class: "name", + name: "")] + end + end + objects_and_names + end + end