include ActionController::Live
skip_around_filter :require_thread_api_token, if: proc { |ctrl|
- (Rails.configuration.anonymous_user_token and
- 'show' == ctrl.action_name) or
- %w(show_file show_file_links).include? ctrl.action_name
+ Rails.configuration.anonymous_user_token and
+ 'show' == ctrl.action_name
}
+ skip_around_filter(:require_thread_api_token,
+ only: [:show_file, :show_file_links])
skip_before_filter(:find_object_by_uuid,
only: [:provenance, :show_file, :show_file_links])
# We depend on show_file to display the user agreement:
# purposes: it lets us return a useful status code for common errors, and
# helps us figure out which token to provide to arv-get.
coll = nil
- tokens = [Thread.current[:arvados_api_token], params[:reader_token]].compact
+ tokens = [Thread.current[:arvados_api_token],
+ params[:reader_token],
+ (Rails.configuration.anonymous_user_token || nil)].compact
usable_token = find_usable_token(tokens) do
coll = Collection.find(params[:uuid])
end
sharing_popup
end
+ def update
+ @updates ||= params[@object.resource_param_name.to_sym]
+ if @updates && (@updates.keys - ["name", "description"]).empty?
+ # exclude manifest_text since only name or description is being updated
+ @object.manifest_text = nil
+ end
+ super
+ end
+
protected
def find_usable_token(token_list)
return nil
end
- def file_enumerator(opts)
+ # Note: several controller and integration tests rely on stubbing
+ # file_enumerator to return fake file content.
+ def file_enumerator opts
FileStreamer.new opts
end