Rework status search to avoid relying on the enum ids, and also to allow translations
This commit is contained in:
parent
2d915b0e24
commit
0366c2eabb
3 changed files with 6 additions and 2 deletions
|
@ -31,7 +31,7 @@ class IssuesController < ApplicationController
|
|||
end
|
||||
|
||||
if params[:status] && params[:status][0].present?
|
||||
@issues = @issues.where(:status => params[:status][0].to_i)
|
||||
@issues = @issues.where(:status => params[:status][0])
|
||||
end
|
||||
|
||||
if params[:issue_type] && params[:issue_type][0].present?
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<%= form_tag(issues_path, :method => :get) do %>
|
||||
<p><%= t ".search_guidance" %></p>
|
||||
<%= select :status, nil, [['open', 0], ['resolved', 2], ['ignored', 1]], { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %>
|
||||
<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t(".states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %>
|
||||
<%= select :issue_type, nil, @issue_types, { :include_blank => t(".select_type")}, data: { behavior: 'category_dropdown' } %>
|
||||
<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
|
||||
<%= select :last_updated_by, nil, @users.all.collect {|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], { :include_blank => t(".select_last_updated_by")}, data: { behavior: 'category_dropdown' } %>
|
||||
|
|
|
@ -931,6 +931,10 @@ en:
|
|||
link_to_reports: Link to Reports
|
||||
reported_user: Reported User
|
||||
link_to_reported_instance: Link to Reported Instance
|
||||
states:
|
||||
ignored: Ignored
|
||||
open: Open
|
||||
resolved: Resolved
|
||||
create:
|
||||
successful_report: Your report has been registered sucessfully
|
||||
provide_details: Please provide the required details
|
||||
|
|
Loading…
Add table
Reference in a new issue