Merge 8a48532 into 6e7f1e5

coopanio · Feb 16, 2023 · 9427c86 · 9427c86
2 parents 6e7f1e5 + 8a48532
commit 9427c86
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -24,10 +24,8 @@
         <%= yield %>
       </div>
     </main>
-    <% if Rails.configuration.x.asembleo.footer %>
-      <footer class="mt-auto py-3">
-        <div class="container"><%= Rails.configuration.x.asembleo.footer %></div>
-      </footer>
-    <% end %>
+    <footer class="mt-auto py-3">
+      <div class="container"><%= Rails.configuration.x.asembleo.footer || t('application.footer') %></div>
+    </footer>
   </body>
 </html>
diff --git a/app/views/questions/_options.html.erb b/app/views/questions/_options.html.erb
@@ -22,8 +22,8 @@
       <tr>
         <td><%= option.description %></td>
         <td><%= option.value %></td>
-        <td><%= link_to t('application.edit'), edit_consultation_question_option_url(@question, option) %></td>
-        <td><%= button_to t('application.delete'), consultation_question_option_path(@question, option), method: :delete, class: 'btn btn-link py-0 link-danger' %></td>
+        <td><%= link_to t('application.edit'), edit_consultation_question_option_url(@consultation, @question, option) %></td>
+        <td><%= button_to t('application.delete'), consultation_question_option_path(@consultation, @question, option), method: :delete, class: 'btn btn-link py-0 link-danger' %></td>
       </tr>
       <% end %>
     </table>

diff --git a/config/application.rb b/config/application.rb
@@ -37,7 +37,7 @@ class Application < Rails::Application
 
     # Branding
     config.x.asembleo.title = ENV['ASEMBLEO_TITLE'].presence || 'Asembleo'
-    config.x.asembleo.footer = ENV['ASEMBLEO_FOOTER'].presence || 'Asembleo is a free software project developed by Coopanio'
+    config.x.asembleo.footer = ENV['ASEMBLEO_FOOTER'].presence
     config.x.asembleo.logo_url = ENV['ASEMBLEO_LOGO_URL'].presence
     config.x.asembleo.default_from = ENV['ASEMBLEO_DEFAULT_FROM'].presence || 'asembleo@example.com'
 

diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
@@ -6,5 +6,12 @@
   # TODO: at some point we need to parameterize this
   # See https://github.com/getsentry/sentry-docs/pull/1723#issuecomment-773479895
   config.dsn = 'https://68a7ebc66a2a477298509ded6f382ca4@o390133.ingest.sentry.io/5449641'
+  config.breadcrumbs_logger = %i[active_support_logger http_logger]
   config.enabled_environments = %w[production]
+  config.traces_sample_rate = 1.0
+
+  config.before_send do |event, hint|
+    event.tags[:domain] = ENV['ASEMBLEO_HOST']
+    event
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -76,6 +76,7 @@ en:
     create: Create
     edit: Edit
     delete: Delete
+    footer: Asembleo is a free software project developed by Coopanio
     log_in: Log in
     log_out: Log out
     refresh: Refresh