Preserve the outer attachment element and fix editing

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/active_text/attachment.rb b/lib/active_text/attachment.rb
index e349c721b2..870390f63e 100644
--- a/lib/active_text/attachment.rb
+++ b/lib/active_text/attachment.rb
@@ -74,11 +74,7 @@ module ActiveText
     end
 
     def to_html
-      if attachable.respond_to?(:to_partial_path)
-        ApplicationController.render(self)
-      else
-        HtmlConversion.node_to_html(node)
-      end
+      HtmlConversion.node_to_html(node)
     end
 
     def to_s
diff --git a/lib/active_text/content.rb b/lib/active_text/content.rb
index c9546fb4c5..190f7d3c7b 100644
--- a/lib/active_text/content.rb
+++ b/lib/active_text/content.rb
@@ -46,7 +46,11 @@ module ActiveText
     end
 
     def to_html
-      render_attachments(&:to_html).to_html
+      render_attachments do |attachment|
+        attachment.node.tap do |node|
+          node.inner_html = ApplicationController.render(attachment)
+        end
+      end.to_html
     end
 
     def to_s