Pass the status symbol to the method not the status value

rubyforgood · Jun 26, 2024 · b14aab0 · b14aab0
1 parent 7045fa7
commit b14aab0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -2,7 +2,9 @@ class ApplicationRecord < ActiveRecord::Base
   primary_abstract_class
 
   # This method is used to translate the enum values for i18n.
-  def human_enum_name(enum_name, enum_value)
-    I18n.t("activerecord.attributes.#{model_name.i18n_key}.#{enum_name}.#{enum_value}")
+  def human_enum_name(enum)
+    enum_i18n_key = enum.to_s
+    value = send(enum)
+    I18n.t("activerecord.attributes.#{model_name.i18n_key}.#{enum_i18n_key}.#{value}")
   end
 end
diff --git a/app/views/organizations/adoptable_pets/show.html.erb b/app/views/organizations/adoptable_pets/show.html.erb
@@ -103,7 +103,7 @@
                   <% if AdopterApplication.adoption_exists?(current_user.adopter_foster_account&.id, @pet.id) %>
                     <div class='d-flex align-items-center mt-3'>
                       <h4 class="me-2 mb-0">
-                        <%= "Application Status: #{@adoption_application.human_enum_name('status', @adoption_application.status) || t('.status.default')}" %>
+                        <%= "Application Status: #{@adoption_application.human_enum_name(:status) || t('.status.default')}" %>
                       </h4>
                       <% if %w[under_review adoption_pending].include?(@adoption_application.status) %>
                         <%= image_tag('pause.png', height: '21') %>

diff --git a/app/views/organizations/adopter_fosterer/adopter_applications/_application_cards.html.erb b/app/views/organizations/adopter_fosterer/adopter_applications/_application_cards.html.erb
@@ -17,7 +17,7 @@
     <li class="list-group-item d-flex flex-wrap justify-content-between text-secondary">
       <div class="me-1 fw-semibold"><%= t("views.dashboard.applications.status")%>:</div>
       <div>
-        <%= application.human_enum_name('status', application.status) %>
+        <%= application.human_enum_name(:status) %>
       </div>
     </li>
     <li class="list-group-item d-flex justify-content-center">

diff --git a/app/views/organizations/adopter_fosterer/adopter_applications/_applications_table.html.erb b/app/views/organizations/adopter_fosterer/adopter_applications/_applications_table.html.erb
@@ -32,7 +32,7 @@
             <%= l app.created_at.to_date, format: :long %>
           </td>
           <td>
-            <%= app.human_enum_name('status', app.status) %>
+            <%= app.human_enum_name(:status) %>
           </td>
           <td>
             <% if app.status == 'withdrawn' %>

diff --git a/app/views/organizations/staff/pets/tabs/partials/_application_status.html.erb b/app/views/organizations/staff/pets/tabs/partials/_application_status.html.erb
@@ -1,6 +1,6 @@
 <div class="dropdown">
   <button class="btn dropdown-toggle <%= application_status_classes(app)%>" data-bs-toggle="dropdown" aria-expanded="false">
-    <%= app.human_enum_name('status', app.status) %>
+    <%= app.human_enum_name(:status) %>
   </button>
   <ul class="dropdown-menu">
     <% AdopterApplication.statuses.keys.each do |status| %>