From c606752ab1ba04ed94fcbc9f7aec42166e7f5a72 Mon Sep 17 00:00:00 2001 From: sktocha Date: Fri, 7 Apr 2017 12:00:47 +0300 Subject: [PATCH 1/5] update base_uploader for newer versions of carrierwave --- lib/ab_admin/carrierwave/base_uploader.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ab_admin/carrierwave/base_uploader.rb b/lib/ab_admin/carrierwave/base_uploader.rb index 5b5920b7..89b60b99 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 def filename internal_identifier || model.send("#{mounted_as}_file_name") || (store_filename && "#{secure_token}#{File.extname(store_filename).downcase}") From 0358b3981181eb871b00f1b420844ec7bc3115f3 Mon Sep 17 00:00:00 2001 From: sktocha Date: Fri, 12 May 2017 14:07:44 +0300 Subject: [PATCH 2/5] fix --- lib/ab_admin/carrierwave/base_uploader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ab_admin/carrierwave/base_uploader.rb b/lib/ab_admin/carrierwave/base_uploader.rb index 89b60b99..00947b24 100644 --- a/lib/ab_admin/carrierwave/base_uploader.rb +++ b/lib/ab_admin/carrierwave/base_uploader.rb @@ -67,7 +67,7 @@ def store_model_filename(record) end alias_method :store_filename, :filename - alias_method :extension_white_list, :extension_whitelist + 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}") From 8b82b0d4a3913838de418d5b699f4a3c763577e7 Mon Sep 17 00:00:00 2001 From: sktocha Date: Wed, 13 Dec 2017 17:40:08 +0200 Subject: [PATCH 3/5] fix deprication for inherited_resources --- app/controllers/admin/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb index 39729f94..318b870b 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 falsh_interpolation_options return {} if collection_action? || resource.errors.empty? {errors: resource.errors.full_messages.map { |m| "
- #{m}" }.join.html_safe} end From 3bf62f3e4639007d869b073f29eb70646ae7e57f Mon Sep 17 00:00:00 2001 From: sktocha Date: Wed, 3 Jan 2018 13:54:36 +0200 Subject: [PATCH 4/5] fix typo in base_controller flash_interpolation_options --- app/controllers/admin/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb index 318b870b..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 falsh_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 From 5c948c59d96d32fc2fc59a2d41562b5363cca841 Mon Sep 17 00:00:00 2001 From: sktocha Date: Wed, 3 Jan 2018 13:59:18 +0200 Subject: [PATCH 5/5] update possible devise version --- ab_admin.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'