X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/936fa855bac1dc1182f134c1b9f2eddb22c3e469..96b2469f9be45c620e4173cdd1101eb4664f6fd0:/app/controllers/application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4ce0d55ba0..6535888996 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -56,16 +56,20 @@ class ApplicationController < ActionController::Base
 
   def show
     if !@object
-      render_not_found("object not found")
+      return render_not_found("object not found")
     end
     respond_to do |f|
       f.json { render json: @object }
+      f.html { render }
     end
   end
 
   def current_user
-    if Thread.current[:api_token]
+    if Thread.current[:orvos_api_token]
       @current_user ||= User.current
+    else
+      logger.error "No API token in Thread"
+      return nil
     end
   end