diff --git a/ab_admin.gemspec b/ab_admin.gemspec index 112654e9..8a9ce563 100644 --- a/ab_admin.gemspec +++ b/ab_admin.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency 'ransack' s.add_dependency 'has_scope' s.add_dependency 'simple_slug' - s.add_dependency 'devise', '~> 3.3' + s.add_dependency 'devise', '~> 4' s.add_dependency 'cancancan', '~> 1.7' s.add_dependency 'galetahub-enum_field' s.add_dependency 'awesome_nested_set', '~> 3.0.1' diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb index 39729f94..55f95cbd 100644 --- a/app/controllers/admin/base_controller.rb +++ b/app/controllers/admin/base_controller.rb @@ -176,7 +176,7 @@ def track_current_action(*) track_action if settings[:history] end - def interpolation_options + def flash_interpolation_options return {} if collection_action? || resource.errors.empty? {errors: resource.errors.full_messages.map { |m| "
- #{m}" }.join.html_safe} end diff --git a/lib/ab_admin/carrierwave/base_uploader.rb b/lib/ab_admin/carrierwave/base_uploader.rb index 5b5920b7..00947b24 100644 --- a/lib/ab_admin/carrierwave/base_uploader.rb +++ b/lib/ab_admin/carrierwave/base_uploader.rb @@ -1,14 +1,17 @@ require 'mime/types' require 'mini_magick' require 'carrierwave/processing/mini_magick' -require 'carrierwave/processing/mime_types' +begin require 'carrierwave/processing/mime_types'; rescue LoadError; end module AbAdmin module CarrierWave class BaseUploader < ::CarrierWave::Uploader::Base include ::CarrierWave::MiniMagick - include ::CarrierWave::MimeTypes include AbAdmin::Utils::EvalHelpers + if defined? ::CarrierWave::MimeTypes + include ::CarrierWave::MimeTypes + process :set_content_type + end class_attribute :transliterate, :human_filenames self.transliterate = true @@ -20,8 +23,6 @@ class BaseUploader < ::CarrierWave::Uploader::Base storage :file - process :set_content_type - with_options if: :image? do |img| img.process :strip img.process cropper: lambda { |model| model.cropper_geometry } @@ -66,6 +67,7 @@ def store_model_filename(record) end alias_method :store_filename, :filename + alias_method(:extension_white_list, :extension_whitelist) if instance_methods.include?(:extension_whitelist) def filename internal_identifier || model.send("#{mounted_as}_file_name") || (store_filename && "#{secure_token}#{File.extname(store_filename).downcase}")