From be45f3454e8a2e7e23f5f29bbb6936178f54ab40 Mon Sep 17 00:00:00 2001
From: david <david@joules.ch>
Date: Mon, 23 Sep 2024 00:55:45 +0200
Subject: [PATCH] add rich_text fields to backup and put main in container

---
 app/models/admin/backup.rb             |  7 +++++--
 app/views/layouts/application.html.erb | 12 +++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

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 @@
       <div class="row">
         <%= render partial: "layouts/sidebar" %>
         <main class="col ps-md-2 pt-2 <%= "border-start" if sidebar? %>">
-          <%= render partial: "layouts/flash" %>
-          <% if false && sidebar? %>
-            <a href="#" data-bs-target="#sidebar" data-bs-toggle="collapse" class="p-1 text-decoration-none"><i class="bi bi-list bi-lg py-2 p-1"></i> Menu</a>
-          <% end %>
+          <div class="container">
+            <%= render partial: "layouts/flash" %>
+            <% if false && sidebar? %>
+              <a href="#" data-bs-target="#sidebar" data-bs-toggle="collapse" class="p-1 text-decoration-none"><i class="bi bi-list bi-lg py-2 p-1"></i> Menu</a>
+            <% end %>
 
-          <%= yield %>
+            <%= yield %>
+          </div>
         </main>
       </div>
     </div>