Skip to content

update base_uploader for newer versions of carrierwave #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sktocha wants to merge 5 commits into
base: master
Choose a base branch
from
Open

update base_uploader for newer versions of carrierwave #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c606752
update base_uploader for newer versions of carrierwave
sktocha Apr 7, 2017
0358b39
fix
sktocha May 12, 2017
8b82b0d
fix deprication for inherited_resources
sktocha Dec 13, 2017
3bf62f3
fix typo in base_controller flash_interpolation_options
sktocha Jan 3, 2018
5c948c5
update possible devise version
sktocha Jan 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ab_admin.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/base_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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| "<br/> - #{m}" }.join.html_safe}
end
Expand Down
10 changes: 6 additions & 4 deletions lib/ab_admin/carrierwave/base_uploader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }
Expand Down Expand Up @@ -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}")
Expand Down