Show deleted #1904
Merged
Show deleted #1904
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
spaghetticode
force-pushed
the
show_deleted
branch
from
5e8411c to
8eab860
Compare
houndci-bot
reviewed
May 12, 2017
core/app/models/spree/product.rb
Outdated
| @@ -103,6 +103,11 @@ def find_or_build_master | |||
| self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants] | |||
| self.whitelisted_ransackable_attributes = %w[slug] | |||
|
|
|||
| # This enables "Show Deleted" checkbox feature in admin/products page | |||
| def self.ransackable_scopes(auth_object = nil) | |||
There was a problem hiding this comment.
Unused method argument - auth_object. If it's necessary, use _ or _auth_object as an argument name to indicate that it won't be used. You can also write as ransackable_scopes(*) if you want the method to accept any arguments but don't care about them.
| end | ||
|
|
||
| context 'when params[:q][:with_deleted] is set to "true"' do | ||
| let(:params) { { q: {with_deleted: 'true' } } } |
spaghetticode
force-pushed
the
show_deleted
branch
5 times, most recently
from
b2681e0 to
142618f
Compare
kennyadsl
reviewed
May 15, 2017
|
|
||
| context 'when params[:q][:with_deleted] is set to "true"' do | ||
| let(:params) { { q: { with_deleted: 'true' } } } | ||
| it 'includes soft-deleted products' do |
There was a problem hiding this comment.
I'd leave an empty line after let here
core/app/models/spree/product.rb
Outdated
| @@ -103,6 +103,11 @@ def find_or_build_master | |||
| self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants] | |||
| self.whitelisted_ransackable_attributes = %w[slug] | |||
|
|
|||
| # This enables "Show Deleted" checkbox feature in admin/products page | |||
There was a problem hiding this comment.
I'm not sure about this comment line. If we'll add other scopes later this line had to be removed/changed in something more generic. I'm for removing it since we can understand why this code is here by using git history.
| @@ -34,7 +34,7 @@ | |||
| <div class="col-2"> | |||
| <div class="field checkbox"> | |||
| <label> | |||
| <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %> | |||
| <%= f.check_box :with_deleted, {checked: params[:q][:with_deleted] == 'true'}, 'true', 'false' %> | |||
There was a problem hiding this comment.
I'd take advantage of this change to add spaces inside {} to be consistent with the rest of the code .
The "Show Deleted" checkbox param was removed in the controller, so it didn't stay checked. This also affected pagination (deleted products could be seen only on first page). The use of ransackable scopes to manage products.deleted_at field allows some code cleanup.
spaghetticode
force-pushed
the
show_deleted
branch
from
142618f to
0240914
Compare
|
Thank you! |
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.
Fix for issue #1903