Commit 4ae1e3e7 by ivan Lan

Improve the last commit about custom trigger condition

parent 187d84a4
...@@ -75,7 +75,6 @@ module Shotengai ...@@ -75,7 +75,6 @@ module Shotengai
def index def index
page = params[:page] || 1 page = params[:page] || 1
per_page = params[:per_page] || 10 per_page = params[:per_page] || 10
# @resources = index_resources.paginate(page: page, per_page: per_page) # @resources = index_resources.paginate(page: page, per_page: per_page)
@resources = paginate(index_resources, page: page, per_page: per_page) @resources = paginate(index_resources, page: page, per_page: per_page)
respond_with @resources, template: "#{@template_dir}/index" respond_with @resources, template: "#{@template_dir}/index"
...@@ -151,7 +150,7 @@ module Shotengai ...@@ -151,7 +150,7 @@ module Shotengai
end end
def paginate resources, page: , per_page: def paginate resources, page: , per_page:
return resources if skip_paginate? return resources if skip_paginate?(page, per_page)
# page start with 1 # page start with 1
if resources.is_a?(Array) if resources.is_a?(Array)
resources[(page - 1) * per_page ... page * per_page] || [] resources[(page - 1) * per_page ... page * per_page] || []
...@@ -160,10 +159,10 @@ module Shotengai ...@@ -160,10 +159,10 @@ module Shotengai
end end
end end
def skip_paginate? def skip_paginate? page, per_page
page <= 0 || per_page <= 0 page <= 0 || per_page <= 0
end end
# If you want to add custome columns, you can do just like: # If you want to add custome columns, you can do just like:
# def resource_params # def resource_params
# super&.merge params.require(:some_key) # super&.merge params.require(:some_key)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment