projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3036: Use preload_objects to fetch owner_uuids in the controller instead of in the...
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
application_controller.rb
diff --git
a/apps/workbench/app/controllers/application_controller.rb
b/apps/workbench/app/controllers/application_controller.rb
index 5b9d41e94ecd8ff12b3a591e4a29ca1079dd656b..5c99c15abc62544f79c4bca6f148da051f8e59a8 100644
(file)
--- a/
apps/workbench/app/controllers/application_controller.rb
+++ b/
apps/workbench/app/controllers/application_controller.rb
@@
-202,7
+202,7
@@
class ApplicationController < ActionController::Base
return render_not_found("object not found")
end
respond_to do |f|
return render_not_found("object not found")
end
respond_to do |f|
- f.json { render json: @object.attributes.merge(href: url_for(@object)) }
+ f.json { render json: @object.attributes.merge(href: url_for(
action: :show, id:
@object)) }
f.html {
if params['tab_pane']
render_pane params['tab_pane']
f.html {
if params['tab_pane']
render_pane params['tab_pane']
@@
-274,7
+274,7
@@
class ApplicationController < ActionController::Base
@object ||= model_class.new @new_resource_attrs, params["options"]
if @object.save
respond_to do |f|
@object ||= model_class.new @new_resource_attrs, params["options"]
if @object.save
respond_to do |f|
- f.json { render json: @object.attributes.merge(href: url_for(@object)) }
+ f.json { render json: @object.attributes.merge(href: url_for(
action: :show, id:
@object)) }
f.html {
redirect_to @object
}
f.html {
redirect_to @object
}