projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add and remove collection tags with ajax.
[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 cc452b93cbf6b3c4dfceac5bc533b6a2523038cf..e94428e92dca51ad00e415f38dac8ff69c35c4ef 100644
(file)
--- a/
apps/workbench/app/controllers/application_controller.rb
+++ b/
apps/workbench/app/controllers/application_controller.rb
@@
-57,7
+57,7
@@
class ApplicationController < ActionController::Base
end
def index
end
def index
- @objects ||= model_class.limit(
10
00).all
+ @objects ||= model_class.limit(
2
00).all
respond_to do |f|
f.json { render json: @objects }
f.html { render }
respond_to do |f|
f.json { render json: @objects }
f.html { render }
@@
-107,14
+107,21
@@
class ApplicationController < ActionController::Base
end
def create
end
def create
- @object ||= model_class.new params[model_class.to_s.
singularize.to_sym
]
+ @object ||= model_class.new params[model_class.to_s.
underscore.singularize
]
@object.save!
@object.save!
- redirect_to(params[:return_to] || @object)
+ respond_to do |f|
+ f.json { render json: @object }
+ f.html {
+ redirect_to(params[:return_to] || @object)
+ }
+ f.js { render }
+ end
end
def destroy
if @object.destroy
respond_to do |f|
end
def destroy
if @object.destroy
respond_to do |f|
+ f.json { render json: @object }
f.html {
redirect_to(params[:return_to] || :back)
}
f.html {
redirect_to(params[:return_to] || :back)
}