Include URL helpers for easier customization for controllers and memb…

…er actions
excid3 · Oct 29, 2024 · 8255806 · 8255806
1 parent 12529ce
commit 8255806
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ### Unreleased
 
+### 2.0.0
+
+- Remove Tailwind CDN
+- Add styles through asset pipeline
+- Refactor JavaScript into an Import map (separate from the Rails app)
+
 ### 1.2.10
 
 - Fix compatibility with Pagy 8.x

diff --git a/app/controllers/madmin/application_controller.rb b/app/controllers/madmin/application_controller.rb
@@ -1,5 +1,7 @@
 module Madmin
   class ApplicationController < Madmin::BaseController
+    include Rails.application.routes.url_helpers
+
     before_action :authenticate_admin_user
 
     def authenticate_admin_user

diff --git a/app/helpers/madmin/application_helper.rb b/app/helpers/madmin/application_helper.rb
@@ -1,6 +1,7 @@
 module Madmin
   module ApplicationHelper
     include Pagy::Frontend
+    include Rails.application.routes.url_helpers
 
     def clear_search_params
       resource.index_path(sort: params[:sort], direction: params[:direction])

diff --git a/app/views/madmin/application/show.html.erb b/app/views/madmin/application/show.html.erb
@@ -9,7 +9,7 @@
 
   <div class="actions">
     <% resource.member_actions.each do |action| %>
-      <%= instance_eval(&action)  %>
+      <%= instance_exec(@record, &action) %>
     <% end %>
     <%= link_to "Edit", resource.edit_path(@record), class: "btn btn-secondary" %>
     <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { turbo_confirm: "Are you sure?" }, class: "btn btn-danger" %>