projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2376-show-collection-tags-everywhere' into 1971-show-image-thumbnails
[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 61351d644974a657da435b7d39e9699cabfe7706..1e4094dbc1498d5925719aaff97e88c995515235 100644
(file)
--- a/
apps/workbench/app/controllers/application_controller.rb
+++ b/
apps/workbench/app/controllers/application_controller.rb
@@
-30,6
+30,7
@@
class ApplicationController < ActionController::Base
end
def render_error(opts)
end
def render_error(opts)
+ opts = {status: 500}.merge opts
respond_to do |f|
# json must come before html here, so it gets used as the
# default format when js is requested by the client. This lets
respond_to do |f|
# json must come before html here, so it gets used as the
# default format when js is requested by the client. This lets
@@
-58,7
+59,19
@@
class ApplicationController < ActionController::Base
end
def index
end
def index
- @objects ||= model_class.limit(200).all
+ if params[:limit]
+ limit = params[:limit].to_i
+ else
+ limit = 200
+ end
+
+ if params[:offset]
+ offset = params[:offset].to_i
+ else
+ offset = 0
+ end
+
+ @objects ||= model_class.limit(limit).offset(offset).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 }
@@
-149,7
+162,8
@@
class ApplicationController < ActionController::Base
def breadcrumb_page_name
(@breadcrumb_page_name ||
def breadcrumb_page_name
(@breadcrumb_page_name ||
- (@object.friendly_link_name if @object.respond_to? :friendly_link_name))
+ (@object.friendly_link_name if @object.respond_to? :friendly_link_name) ||
+ action_name)
end
def index_pane_list
end
def index_pane_list