Attempt a few patches

Author: parndt

core/app/helpers/refinery/action_helper.rb

@@ -39,7 +39,7 @@ def edit_in_current_locale(url:, title:, **options)
 
     def edit_in_locale(locale, url:, title:, **options)
       if options.delete(:label)
-        title = language(locale)
+        title = locale_language(locale)
         action_label(:locale, "#{url}?switch_locale=#{locale}", title, **options,
                     id: locale, class: :edit, **options
         )

core/app/helpers/refinery/translation_helper.rb

@@ -17,9 +17,9 @@ def translated_field(record, field)
 
     def locales_with_translated_field(record, field_name, include_current: true)
       field_name = field_name.to_sym
-      translations = record.translations.where.not(field_name, nil )
+      translations = record.translations.where.not(field_name => [nil, ""])
       translations = translations.where.not(locale: current_locale) unless include_current
-      translations.map(&:locale).sort_by { |t| Refinery::I18n.frontend_locales.index(t.to_sym) }
+      translations.map { |t| t.locale.to_sym }.sort_by { |locale| Refinery::I18n.frontend_locales.index(locale) }
     end
 
     def current_locale?(locale) = locale.to_sym == Refinery::I18n.current_locale

core/lib/refinery/crud.rb

@@ -60,7 +60,7 @@ def crudify(model_name, options = {})
           def self.crudify_options
             #{options.inspect}
           end
-          
+
           prepend_before_action :find_#{singular_name}, only: #{actions}
           prepend_before_action :merge_position_into_params!, :only => :create
 

core/lib/refinery/generators/generated_attribute.rb

@@ -3,9 +3,22 @@
 module Refinery
   module Generators
     class GeneratedAttribute < Rails::Generators::GeneratedAttribute
+      REFINERY_TYPES = %w(image resource radio select checkbox)
+
       attr_accessor :refinery_type
 
       class << self
+        def parse(column_definition)
+          name, type, index_type = column_definition.split(":")
+
+          # Handle Refinery's custom types before Rails validates them
+          if type && REFINERY_TYPES.include?(type)
+            new(name, type.to_sym, index_type)
+          else
+            super
+          end
+        end
+
         def reference?(type)
           [:references, :belongs_to, :image, :resource].include? type
         end

core/spec/lib/refinery/crud_spec.rb

@@ -15,7 +15,8 @@ class CrudDummy < ActiveRecord::Base
   end
 
   class CrudDummyController < ::ApplicationController
-    crudify :'refinery/crud_dummy'
+    skip_before_action :find_or_set_locale, raise: false
+    crudify :'refinery/crud_dummy', find_actions: [:update, :destroy, :edit]
   end
 end
 

core/spec/system/refinery/admin/xhr_paging_spec.rb

@@ -21,8 +21,8 @@ module Refinery
       it 'performs ajax paging of index' do
         visit refinery.admin_images_path
 
-        expect(page).to have_selector('ul#image_grid li > img', count: 1)
-        expect(page).to have_css(%Q{img[alt="#{first_image.title}"]})
+        expect(page).to have_selector('ul#image_index li.image', count: 1)
+        expect(page).to have_css(%Q{img[alt="#{first_image.alt}"]})
 
         # placeholder which would disappear in a full page refresh.
         page.execute_script("node = document.createElement('i');")
@@ -33,7 +33,7 @@ module Refinery
           click_link '2'
         end
 
-        expect(page).to have_css(%Q{img[alt="#{last_image.title}"]})
+        expect(page).to have_css(%Q{img[alt="#{last_image.alt}"]})
         expect(page.evaluate_script(
           %{$('i#has_not_refreshed_entire_page').length}
         )).to eq(1)

images/app/controllers/refinery/admin/images_controller.rb

@@ -7,7 +7,8 @@ class ImagesController < ::Refinery::AdminController
               include: [:translations, :crops],
               order: "updated_at DESC",
               sortable: false,
-              conditions: 'parent_id IS NULL'
+              conditions: 'parent_id IS NULL',
+              find_actions: [:update, :destroy, :edit]
 
       before_action :change_view_if_specified, :init_dialog
 

images/app/presenters/refinery/admin/image_presenter.rb

@@ -67,6 +67,7 @@ class ImagePresenter < Refinery::BasePresenter
       attr_reader :image, :context, :index_keys, :i18n_scope
       attr_writer :title, :alt, :filename, :translations, :edit_attributes, :delete_attributes, :preview_attributes
       delegate_missing_to :image
+      delegate :t, to: :context
 
       IndexEntry = Struct.new('ImageEntry', :id, :edit_link, :text_elements, :locales, :actions)
 

images/lib/refinery/images/configuration.rb

@@ -6,7 +6,7 @@ module Images
 
     config_accessor :max_image_size, :pages_per_dialog, :pages_per_admin_index,
                     :pages_per_dialog_that_have_size_options, :user_image_sizes, :user_image_ratios,
-                    :image_views, :preferred_image_view, :admin_image_sizes,
+                    :index_views, :preferred_index_view, :admin_image_sizes,
                     :allowed_mime_types, :allowed_mime_types_msg
 
     self.max_image_size = 5_242_880
@@ -29,8 +29,8 @@ module Images
     }
     self.allowed_mime_types = %w[image/jpeg image/png image/gif image/tiff]
     self.allowed_mime_types_msg = self.allowed_mime_types.to_sentence(last_word_connector: ' or ')
-    self.image_views = [:grid, :list]
-    self.preferred_image_view = :grid
+    self.index_views = [:grid, :list]
+    self.preferred_index_view = :grid
 
     # Images should always use these changes to the dragonfly defaults
     self.dragonfly_name         = :refinery_images

pages/app/controllers/refinery/pages/admin/preview_controller.rb

@@ -9,6 +9,7 @@ class PreviewController < Refinery::PagesController
         include Pages::RenderOptions
 
         skip_before_action :error_404, :set_canonical
+        skip_after_action :store_location?, raise: false
 
         layout :layout