Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
shotengai
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
shotengai
Commits
4ae1e3e7
Commit
4ae1e3e7
authored
Mar 19, 2018
by
ivan Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the last commit about custom trigger condition
parent
187d84a4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
base.rb
lib/shotengai/controller/base.rb
+2
-3
No files found.
lib/shotengai/controller/base.rb
View file @
4ae1e3e7
...
@@ -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,7 +159,7 @@ module Shotengai
...
@@ -160,7 +159,7 @@ 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment