projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18027-unmount-fuse'
[arvados.git]
/
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 90b0a9228b91a1f806d081ba15656bfa016b8ee0..c6e8894352f4f5f147c1d8e7f7d4c6d7db331aab 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@
-10,17
+10,16
@@
class Arvados::V1::KeepServicesController < ApplicationController
def find_objects_for_index
# all users can list all keep services
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'
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
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
render_list
end
-
end
end