Merge branch 'master' into 2525-java-sdk

[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 8c7ae7a829b529ddd9549a98fa6526f15c1b8fee..fc2ee9300287406479b0d2ec1ff97e88418c52a4 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@ -1,7 +1,7 @@
 class Arvados::V1::KeepServicesController < ApplicationController
 
-  skip_before_filter :find_object_by_uuid, only: :accessable
-  skip_before_filter :render_404_if_no_object, only: :accessable
+  skip_before_filter :find_object_by_uuid, only: :accessible
+  skip_before_filter :render_404_if_no_object, only: :accessible
 
   def find_objects_for_index
     # all users can list all keep services
@@ -9,16 +9,12 @@ class Arvados::V1::KeepServicesController < ApplicationController
     super
   end
 
-  def accessable
-    puts "Hello world"
-    if request.headers['X-Keep-Proxy-Required']
+  def accessible
+    if request.headers['X-External-Client'] == '1'
       @objects = model_class.where('service_type=?', 'proxy')
     else
       @objects = model_class.where('service_type=?', 'disk')
     end
-
-    puts "Rendering list now"
-
     render_list
   end