X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bb91f86ea02e3535e3953ee0916dd6877bf585f7..dccac1099d26fb9d40bf8ace962702a4e9ab1c40:/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 5fcb2dc569..ed10d63e66 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -9,17 +9,17 @@ require "uri" class CollectionsController < ApplicationController include ActionController::Live - skip_around_filter :require_thread_api_token, if: proc { |ctrl| + skip_around_action :require_thread_api_token, if: proc { |ctrl| Rails.configuration.anonymous_user_token and 'show' == ctrl.action_name } - skip_around_filter(:require_thread_api_token, + skip_around_action(:require_thread_api_token, only: [:show_file, :show_file_links]) - skip_before_filter(:find_object_by_uuid, + skip_before_action(:find_object_by_uuid, only: [:provenance, :show_file, :show_file_links]) # We depend on show_file to display the user agreement: - skip_before_filter :check_user_agreements, only: :show_file - skip_before_filter :check_user_profile, only: :show_file + skip_before_action :check_user_agreements, only: :show_file + skip_before_action :check_user_profile, only: :show_file RELATION_LIMIT = 5 @@ -300,30 +300,6 @@ class CollectionsController < ApplicationController end end - def tags - render - end - - def save_tags - tags_param = params['tag_data'] - if tags_param - if tags_param.is_a?(String) && tags_param == "empty" - tags = {} - else - tags = tags_param - end - end - - if tags - if @object.update_attributes properties: tags - @saved_tags = true - render - else - self.render_error status: 422 - end - end - end - protected def find_usable_token(token_list)