X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5420797c32e73347a79b5ecd8cdfbd212fd8aae8..660e8d8345bfe7f34dfc8db655eff6a0af8bd47f:/apps/workbench/app/controllers/application_controller.rb?ds=sidebyside diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb index 412f86ce07..c169be2704 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -58,7 +58,19 @@ class ApplicationController < ActionController::Base 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 } @@ -149,7 +161,8 @@ class ApplicationController < ActionController::Base 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 @@ -320,14 +333,14 @@ class ApplicationController < ActionController::Base } } - @@notification_tests.push lambda { |controller, current_user| - Job.limit(1).where(created_by: current_user.uuid).each do - return nil - end - return lambda { |view| - view.render partial: 'notifications/jobs_notification' - } - } + #@@notification_tests.push lambda { |controller, current_user| + # Job.limit(1).where(created_by: current_user.uuid).each do + # return nil + # end + # return lambda { |view| + # view.render partial: 'notifications/jobs_notification' + # } + #} @@notification_tests.push lambda { |controller, current_user| Collection.limit(1).where(created_by: current_user.uuid).each do