* Allow the system user to update job columns, even if the job is "locked"

[arvados.git] / services / api / app / controllers / static_controller.rb

diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb
index 533f6557e60ac365876066a9cb47a1e7ca02e0de..fda088095e9f5e075f4fd52eaeea711e025280e7 100644 (file)
--- a/services/api/app/controllers/static_controller.rb
+++ b/services/api/app/controllers/static_controller.rb
@@ -1,11 +1,18 @@
 class StaticController < ApplicationController
+  respond_to :json, :html
 
-  skip_before_filter :uncamelcase_params_hash_keys
   skip_before_filter :find_object_by_uuid
-  skip_before_filter :require_auth_scope_all, :only => :home
+  skip_before_filter :render_404_if_no_object
+  skip_before_filter :require_auth_scope_all, :only => [ :home, :login_failure ]
 
   def home
-    render 'intro'
+    if Rails.configuration.respond_to? :workbench_address
+      redirect_to Rails.configuration.workbench_address
+    else
+      render json: {
+        error: ('This is the API server; you probably want to be at the workbench for this installation. Unfortunately, config.workbench_address is not set so I can not redirect you there automatically')
+      }
+    end
   end
 
 end