maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filter classified listings by published status for mods (#7432)

Browse source 
* Filter classified listings by published status for mods

* Change checkbox label, invert logic, respect checked status
This commit is contained in:
Michael Kohl 2020-04-24 21:31:29 +07:00 • committed by GitHub
parent 4ab202ab0a
commit f791e84f2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/internal/classified_listings_controller.rb
View file

@ -7,6 +7,7 @@ class Internal::ClassifiedListingsController < Internal::ApplicationController
ClassifiedListing.includes(%i[user classified_listing_category]).
page(params[:page]).order("bumped_at DESC").per(50)
@classified_listings = @classified_listings.published unless include_unpublished?
@classified_listings = @classified_listings.where(category: params[:filter]) if params[:filter].present?
end
@ -46,4 +47,8 @@ class Internal::ClassifiedListingsController < Internal::ApplicationController
unpublish_listing if listing_params[:published] == "0"
publish_listing if listing_params[:published] == "1"
end
def include_unpublished?
params[:include_unpublished] == "1"
end
end

7
app/views/internal/classified_listings/index.html.erb
View file

@ -11,7 +11,12 @@
</div>
<div class="form-group">
<%= label_tag(:filter, "Category") %>
<%= select_tag(:filter, options_for_select([""] + ClassifiedListing.categories_available.keys, params[:filter])) %>
<%= select_tag(:filter, options_for_select(ClassifiedListing.categories_available.keys, params[:filter]), include_blank: true) %>
</div>
<div class="form-group">
<%= label_tag(:include_unpublished, "Include unpublished listings") %>
<%= hidden_field_tag(:include_unpublished, 0) %>
<%= check_box_tag(:include_unpublished, 1, params[:include_unpublished] == "1") %>
</div>
<div class="form-group">
<%= submit_tag("Filter") %>

16
spec/requests/internal/classified_listings_spec.rb
View file

@ -11,11 +11,25 @@ RSpec.describe "/internal/listings", type: :request do
end
it "clears listing cache" do
put "/internal/listings/#{classified_listing.id}", params: {
put internal_listing_path(id: classified_listing.id), params: {
classified_listing: { title: "updated" }
}
sidekiq_perform_enqueued_jobs
expect(CacheBuster).to have_received(:bust_classified_listings)
end
describe "GET /internal/listings" do
let(:unpublished_listing) { create(:classified_listing, published: false) }
it "filters unpublished listings by default" do
get internal_listings_path
expect(response.body).not_to match(unpublished_listing.title)
end
it "includes unpublished listings when asked to" do
get internal_listings_path, params: { include_unpublished: "1" }
expect(response.body).to match(unpublished_listing.title)
end
end
end
end