X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9a6559f936fb93f63e163690be4ed670a76dd135..46efb1e7f49d08095a6a49a4c6aff045c5eb6f16:/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 978395140b..8c2f72e668 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,6 +1,9 @@ class ProjectsController < ApplicationController before_filter :set_share_links, if: -> { defined? @object } - skip_around_filter :require_thread_api_token, only: [:show, :tab_counts] + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + %w(show tab_counts).include? ctrl.action_name + } def model_class Group @@ -154,7 +157,7 @@ class ProjectsController < ApplicationController object.destroy end end - while (objects = @object.contents(include_linked: false)).any? + while (objects = @object.contents).any? objects.each do |object| object.update_attributes! owner_uuid: current_user.uuid end @@ -195,7 +198,6 @@ class ProjectsController < ApplicationController (val.is_a?(Array) ? val : [val]).each do |type| objects = @object.contents(order: @order, limit: @limit, - include_linked: true, filters: (@filters - kind_filters + [['uuid', 'is_a', type]]), ) objects.each do |object| @@ -233,7 +235,6 @@ class ProjectsController < ApplicationController else @objects = @object.contents(order: @order, limit: @limit, - include_linked: true, filters: @filters, offset: @offset) @next_page_href = next_page_href(partial: :contents_rows,