diff --git a/app/models/admin/backup.rb b/app/models/admin/backup.rb index 6483f8e..f3b1c45 100644 --- a/app/models/admin/backup.rb +++ b/app/models/admin/backup.rb @@ -17,9 +17,12 @@ module Admin next unless klass workbook.add_worksheet(name: table) do |sheet| - sheet << klass.attribute_names + attributes = klass.attribute_names + attributes += klass.rich_text_association_names if klass.respond_to?(:rich_text_association_names) + + sheet << attributes.map { _1.to_s.sub("rich_text_", "") } klass.find_each do |record| - sheet << record.attributes.values + sheet << attributes.map { _1.starts_with?("rich_text") ? record.send(_1.to_s.sub("rich_text_", "")).body&.to_html : record.send(_1) } end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 40f6f99..3e2e2f2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,12 +17,14 @@
<%= render partial: "layouts/sidebar" %>
"> - <%= render partial: "layouts/flash" %> - <% if false && sidebar? %> - Menu - <% end %> +
+ <%= render partial: "layouts/flash" %> + <% if false && sidebar? %> + Menu + <% end %> - <%= yield %> + <%= yield %> +