Admin Panel pagination preferences cleanup #7730
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Dec 5, 2016
| @@ -16,7 +16,7 @@ def collection | |||
| @search = @collection.ransack(params[:q]) | |||
| @collection = @search.result. | |||
| page(params[:page]). | |||
| per(Spree::Config[:properties_per_page]) | |||
| per(Spree::Config[:admin_properties_per_page]) | |||
There was a problem hiding this comment.
Align per with @search.result. on line 17.
houndci-bot
reviewed
Dec 5, 2016
| @@ -25,7 +25,7 @@ def collection | |||
| @collection = @search.result(distinct: true). | |||
| includes(promotion_includes). | |||
| page(params[:page]). | |||
| per(params[:per_page] || Spree::Config[:promotions_per_page]) | |||
| per(params[:per_page] || Spree::Config[:admin_promotions_per_page]) | |||
There was a problem hiding this comment.
Align per with @search.result(distinct: true). on line 25.
houndci-bot
reviewed
Dec 5, 2016
| @@ -41,7 +41,7 @@ def index | |||
| # see https://github.com/spree/spree/pull/3919 | |||
| @orders = @search.result(distinct: true). | |||
| page(params[:page]). | |||
| per(params[:per_page] || Spree::Config[:orders_per_page]) | |||
| per(params[:per_page] || Spree::Config[:admin_orders_per_page]) | |||
There was a problem hiding this comment.
Align per with @search.result(distinct: true). on line 42.
damianlegawiec
force-pushed
the
hotfix/admin-per-page-configuration
branch
from
cae9744
to
7335f21
Compare
|
@damianlegawiec please rebase with current master. |
…s default value to 30
…nd raises default value to 30
…nd raises default value to 30
…tion preferences in Admin Panel
…in_customer_returns_per_page which actually is used this time
damianlegawiec
force-pushed
the
hotfix/admin-per-page-configuration
branch
from
7335f21
to
5022f1f
Compare
|
@Mafi88 done! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously this was a mess, each list had different settings, some of them weren't even used.