diff --git a/Gemfile.lock b/Gemfile.lock index bae64a178ca443cbd1680501c802af0b55a375b3..7f7439af4751c45d4613b7f27eee012ab3dc631a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/noesya/summernote-rails.git - revision: e60b3a9e84ea8670ab6cbc5eaef33451ac588ca4 + revision: 7463656df2b81ff434c8fa8786453b55be129054 branch: activestorage specs: summernote-rails (0.8.20.1) diff --git a/app/models/concerns/with_blobs.rb b/app/models/concerns/with_blobs.rb index 8a0cd6874e20212d011cd3f4e821db064e5214f3..27a729abf2ae36972f22040537d611906c4e7a16 100644 --- a/app/models/concerns/with_blobs.rb +++ b/app/models/concerns/with_blobs.rb @@ -13,20 +13,25 @@ module WithBlobs blobs_with_ids inherited_blob_ids end + def summernote_embeds + summernote_embeds_reflection_names.map { |summernote_reflection_name| + public_send(summernote_reflection_name) + }.flatten + end + protected def explicit_blob_ids - [rich_text_blob_ids] + [summernote_blob_ids] end def inherited_blob_ids [] end - def rich_text_blob_ids - rich_text_reflection_names.map { |rich_text_reflection_name| - rich_text = public_send(rich_text_reflection_name) - rich_text.present? ? rich_text.embeds.blobs.pluck(:id) : [] + def summernote_blob_ids + summernote_embeds_reflection_names.map { |summernote_reflection_name| + public_send(summernote_reflection_name).pluck(:blob_id) }.flatten end @@ -34,7 +39,7 @@ module WithBlobs university.active_storage_blobs.where(id: ids.flatten.compact) end - def rich_text_reflection_names - @rich_text_reflection_names ||= _reflections.select { |name, reflection| reflection.class_name == "ActionText::RichText" }.keys + def summernote_embeds_reflection_names + @summernote_embeds_reflection_names ||= _reflections.keys.select { |name| name.ends_with?('_summernote_embeds_attachments') } end end diff --git a/app/views/admin/communication/website/posts/show.html.erb b/app/views/admin/communication/website/posts/show.html.erb index f9b199f19ae0c761fb49b5a8c9ea06ca5ce117c7..e2fb1cdbffb9dd9cad4d5ef82571fa3abec771ac 100644 --- a/app/views/admin/communication/website/posts/show.html.erb +++ b/app/views/admin/communication/website/posts/show.html.erb @@ -10,7 +10,7 @@ <div class="card-body"> <%= render 'admin/application/property/text', object: @post, property: :description %> <%= render 'admin/application/property/text', object: @post, property: :text %> - <%#= render 'admin/application/property/summernote_embeds', object: @post, property: :medias %> + <%= render 'admin/application/property/summernote_embeds', object: @post, property: :medias %> <hr> <pre><%= @post.text_new.to_html %></pre> </div>