Support pagination link for Kaminari when no data is returned #1700
Conversation
|
Do both of those tests fail pre fix? |
|
I checked out your code, and and changed the Can you take a second look at your will_paginate test? or, if this is expected, explain why? :-) |
|
@NullVoxPopuli in pr description
|
|
Just needs a changelog entry |
|
Oops. My bad. :-) |
|
Updated change log. Thanks for the quick response team! |
| @@ -8,6 +8,7 @@ Breaking changes: | |||
| - [#1574](https://github.com/rails-api/active_model_serializers/pull/1574) Default key case for the JsonApi adapter changed to dashed. (@remear) | |||
|
|
|||
| Features: | |||
| - [#1700](https://github.com/rails-api/active_model_serializers/pull/1700) Support pagination link for Kaminari when no data is returned | |||
There was a problem hiding this comment.
oh, super sorry, there should be headers above this in the changelog for 'master'
### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.0.rc5...master)
Breaking changes:
Features:
- [#1700](https://github.com/rails-api/active_model_serializers/pull/1700) Support pagination link for Kaminari when no data is returned
Fixes:
Misc:
There was a problem hiding this comment.
OK, moved this to the Fixes section. Thanks!
| @@ -8,6 +8,7 @@ Breaking changes: | |||
| - [#1574](https://github.com/rails-api/active_model_serializers/pull/1574) Default key case for the JsonApi adapter changed to dashed. (@remear) | |||
|
|
|||
| Features: | |||
|
|
|||
There was a problem hiding this comment.
can you remove this line?
|
LGTM! nice work! |
|
@NullVoxPopuli gosh durn it, the changelog was in the wrong spot so I was merging it on the command line. I fix in mater in a moment |
|
Was it? It's under |
|
DOH! it was under rc5 :-( Gotta get used to that. |
Purpose
This PR fixes a bug where the pagination links were showing up (with incorrect data) when a query returned no results and using kaminari.
The issue was in that case kaminari says total_pages is 0, whereas will_paginate says total_pages is 1.
Changes
This updated code supports both cases now and treats them as it had been working for will_paginate, namely no links show up.
Additional helpful information
I added tests for both kaminari and will_paginate. The will_paginate test passed before my change, and the kaminari one failed. Now they both pass.