Fixes #162 - Undefined method 'id' for False class error in view partial

prograils · Apr 19, 2021 · a52cd6b · a52cd6b
1 parent 850832f
commit a52cd6b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/app/controllers/lit/localization_keys_controller.rb b/app/controllers/lit/localization_keys_controller.rb
@@ -119,18 +119,15 @@ def grouped_localizations
     def localization_for(locale, localization_key)
       @_localization_for ||= {}
       key = [locale, localization_key]
-      ret = @_localization_for[key]
-      if ret == false
-        nil
-      elsif ret.nil?
+      if @_localization_for.key?(key)
+        @_localization_for[key]
+      else
         ret = grouped_localizations[localization_key][locale]
         unless ret
           Lit.init.cache.refresh_key("#{locale}.#{localization_key.localization_key}")
-          ret = localization_key.localizations.where(locale_id: Lit.init.cache.find_locale(locale).id).first
+          ret = localization_key.localizations.find_by(locale_id: Lit.init.cache.find_locale(locale).id)
         end
-        @_localization_for[key] = ret ? ret : false
-      else
-        ret
+        @_localization_for[key] = ret ? ret : nil
       end
     end
     helper_method :localization_for

diff --git a/app/views/lit/localization_keys/_localizations_list.html.erb b/app/views/lit/localization_keys/_localizations_list.html.erb
@@ -39,9 +39,13 @@
             <%- available_locales.each do |locale| %>
               <%- localization = localization_for(locale, lk) %>
               <tr>
-                <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
-                  <%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
-                </td>
+                <% if localization %>
+                  <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
+                    <%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
+                  </td>
+                <% else %>
+                  <td class="localization_row"><em>missing</em></td>
+                <% end %>
                 <td class="locale_row text-center">
                   <%= EmojiFlag.new(locale) %>
                   <%= locale %>

diff --git a/lib/lit/cache.rb b/lib/lit/cache.rb
@@ -215,6 +215,7 @@ def localization_keys
 
     def find_localization(locale, key_without_locale, value: nil, force_array: false, update_value: false, default_fallback: false)
       return nil if value.is_a?(Hash)
+
       full_key = "#{locale}.#{key_without_locale}"
       ActiveRecord::Base.transaction do
         localization_key = find_localization_key(key_without_locale)