Skip to content

Commit

Permalink
Merge pull request #324 from codeforjapan/fix-323
Browse files Browse the repository at this point in the history
Reset `Decidim::ApplicationUploader#validate_inside_organization` to original definition
  • Loading branch information
ayuki-joto authored Jan 17, 2022
2 parents aa227bb + 93f690b commit 8dfba37
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions app/uploaders/decidim/application_uploader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ def validate_inside_organization
return if model.is_a?(Decidim::Organization)
return if model.respond_to?(:organization) && model.organization.is_a?(Decidim::Organization)

# HACK: Temporary fix for https://github.com/decidim/decidim/issues/6720
# If this is fixed by decidim, this file (application_uploader.rb)
# should be deleted to keep in sync with upstream!
return if model.class.to_s == "decidim/hero_homepage_content_block"
# Fix for https://github.com/codeforjapan/decidim-cfj/issues/101
return if model.nil?

raise CarrierWave::IntegrityError, I18n.t("carrierwave.errors.not_inside_organization")
end
end
Expand Down

0 comments on commit 8dfba37

Please sign in to comment.