projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename pipeline to pipeline template. refs #1416
[arvados.git]
/
app
/
controllers
/
application_controller.rb
diff --git
a/app/controllers/application_controller.rb
b/app/controllers/application_controller.rb
index 4ce0d55ba0351866866a648ad126e3c3dc50f996..6535888996304af716e9b12c1ab26b056960b0ff 100644
(file)
--- a/
app/controllers/application_controller.rb
+++ b/
app/controllers/application_controller.rb
@@
-56,16
+56,20
@@
class ApplicationController < ActionController::Base
def show
if !@object
def show
if !@object
- render_not_found("object not found")
+ re
turn re
nder_not_found("object not found")
end
respond_to do |f|
f.json { render json: @object }
end
respond_to do |f|
f.json { render json: @object }
+ f.html { render }
end
end
def current_user
end
end
def current_user
- if Thread.current[:api_token]
+ if Thread.current[:
orvos_
api_token]
@current_user ||= User.current
@current_user ||= User.current
+ else
+ logger.error "No API token in Thread"
+ return nil
end
end
end
end