X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cb230b07e0125d819991bc74a1f528740068157d..dc021c3b57dcdebe464c148d55f9990a74e8246b:/services/api/app/controllers/arvados/v1/keep_services_controller.rb diff --git a/services/api/app/controllers/arvados/v1/keep_services_controller.rb b/services/api/app/controllers/arvados/v1/keep_services_controller.rb index e59c5f2578..c6e8894352 100644 --- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb +++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb @@ -1,22 +1,25 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class Arvados::V1::KeepServicesController < ApplicationController - skip_before_filter :find_object_by_uuid, only: :accessible - skip_before_filter :render_404_if_no_object, only: :accessible - skip_before_filter :require_auth_scope, only: :accessible + skip_before_action :find_object_by_uuid, only: :accessible + skip_before_action :render_404_if_no_object, only: :accessible + skip_before_action :require_auth_scope, only: :accessible def find_objects_for_index # all users can list all keep services - @objects = model_class.where('1=1') + @objects = KeepService.all super end def accessible if request.headers['X-External-Client'] == '1' - @objects = model_class.where('service_type=?', 'proxy') + @objects = KeepService.where('service_type=?', 'proxy') else - @objects = model_class.where(model_class.arel_table[:service_type].not_eq('proxy')) + @objects = KeepService.where('service_type<>?', 'proxy') end render_list end - end