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

admin filter feedback category (#20418)

Browse source
This commit is contained in:
Philip How 2023-12-05 16:34:51 +00:00 • committed by GitHub
parent 55997ffba8
commit 25e0ebc1ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/admin/feedback_messages_controller.rb
View file

@ -121,10 +121,15 @@ module Admin
end
def reconcile_ransack_params
if (params[:q] && params.dig(:q, :status_eq).blank?) && params[:status].present?
params[:q] ||= {}
if params.dig(:q, :status_eq).blank? && params[:status].present?
params[:q][:status_eq] = params[:status]
end
params[:status] = params[:q][:status_eq] if params[:q].present? # ransack
if params.dig(:q, :category_eq).blank? && params[:category].present?
params[:q][:category_eq] = params[:category]
end
params[:status] = params[:q][:status_eq] if params[:q].present?
params[:category] = params[:q][:category_eq] if params[:q].present?
end
end
end

9
app/views/admin/feedback_messages/_feedback_message.html.erb
View file

@ -4,15 +4,17 @@
<% feedback_message_emails = @email_messages.select { |email| email.feedback_message_id == feedback_message.id } %>
<% end %>
<details open class="crayons-card" id="accordion-<%= feedback_message.id %>">
<details class="crayons-card" id="accordion-<%= feedback_message.id %>">
<summary class="p-5">
<span id="header<%= feedback_message.id %>">
<span id="collapse__header__link-<%= feedback_message.id %>">
Report #<%= feedback_message.id %> - Submitted: <%= time_ago_in_words feedback_message.created_at %> ago
</span>
<div class="float-right">
<span class="c-indicator c-indicator--warning crayons-subtitle-2"><%= feedback_message.category.titleize %></span>
✉️ Emails Sent: <%= feedback_message_emails.size %> |
<%= link_to "Link to Report #{feedback_message.id}", admin_report_path(feedback_message.id) %>
</div>
</span>
</summary>
@ -60,11 +62,6 @@
<% end %>
</div>
<div class="w-25 max-w-25 px-4">
<h3 class="crayons-subtitle-2 report__tags">
<span class="c-indicator c-indicator--warning float-right"><%= feedback_message.category.titleize %></span>
</h3>
</div>
<div class="w-100 max-w-100 px-4">
<% if feedback_message.offender %>
<h3 class="crayons-subtitle-2">

3
app/views/admin/feedback_messages/index.html.erb
View file

@ -11,6 +11,9 @@
<%= f.label :reporter_username_cont, "Reporter", class: "crayons-field__label m-1 screen-reader-only" %>
<%= f.search_field :reporter_username_cont, placeholder: "Reporter", class: "crayons-textfield w-auto m-1" %>
<%= f.select(:status_eq, options_for_select(%w[Open Invalid Resolved], params[:status] || "Open"), { include_blank: true }, class: "crayons-select w-auto m-1") %>
<%= f.label :category_eq, "Category", class: "crayons-field__label m-1 screen-reader-only" %>
<%= f.select :category_eq, options_for_select(FeedbackMessage::CATEGORIES, params[:category]), { include_blank: true }, class: "crayons-select w-auto m-1" %>
<%= f.submit "Search", class: "crayons-btn crayons-btn--secondary m-1" %>
<% end %>