From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 02:44:50 +0000 (+0800)
Subject: Rework status search to avoid relying on the enum ids, and also to allow translations
X-Git-Tag: live~2949^2~56
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0366c2eabb065f08312f494a58c29d0ed575759d

Rework status search to avoid relying on the enum ids, and also to allow translations
---

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7f455b9e9..e79a03203 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -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?
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 56de810c2..b9f0b6e7d 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -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' } %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fefa5a484..4d1ef3b49 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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