jav_madmin 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8851921f59e223564ae393dcca61c00e2b03aeabe258f6e81a7094cae3a17a75
-  data.tar.gz: 50cde4226e316d257c897f21cc33ea1f0b4eadfc2ec87650a4e8d715e3008911
+  metadata.gz: de5e112e317fa81235e17c2d449ed30233b5f7de20bb646ba17eb587065f914c
+  data.tar.gz: 28360b51195be493c260b182df03a08b7a5d4de3ed419a46682ecdcb7fde8f36
 SHA512:
-  metadata.gz: a7806677198d529826ad3ed638e34f6bbd79c5ae7cc3513931ec6bcb156ef6961d66523055f0b7481739d0c687791826e58bcd3a336cd8fd981ed40d598e4691
-  data.tar.gz: bf42482ce949754a19245f272e78f2a34974c9bcba08fef199b23f410a15d973a5b9f0bdb07fcf380870c17fd864a42ca69c3f689d286b553bbfbca7dbd243e7
+  metadata.gz: 7283c6f7073392ef550e9e5be2813ffbeb2a2cb5d30dbf345ed2fa22e10848e0785f406f23f98170ba90ccadb86453b7eb5cc696a3981c75fd179e933bf03dee
+  data.tar.gz: 6770f1fde2084d0657c6b578b4fb392deebbbf2d85f9dbaa19dd8dbce60095aa5827d1daf916bd99f229cd70942e270739844955895bb4622cabd15f02e047ab

data/app/views/madmin/application/_navigation.html.erb

@@ -3,13 +3,13 @@
 
   <% Madmin.menu.render do |item| %>
     <% if item.url %>
-      <%= nav_link_to item.human_label, item.url, starts_with: item.url %>
+      <%= nav_link_to item.label, item.url, starts_with: item.url %>
     <% else %>
-      <h4><%= item.human_label %></h4>
+      <h4><%= item.label %></h4>
     <% end %>
 
     <% item.items.each do |item| %>
-      <%= nav_link_to item.human_label, item.url, starts_with: item.url %>
+      <%= nav_link_to item.label, item.url, starts_with: item.url %>
     <% end %>
   <% end %>
 </nav>

data/app/views/madmin/application/show.html.erb

@@ -13,7 +13,7 @@
     <% end %>
     <% unless resource.readonly? %>
       <%= link_to t("madmin.actions.edit"), resource.edit_path(@record), class: "btn btn-secondary" %>
-      <%= button_to t("madmin.actions.delete"), resource.show_path(@record), method: :delete, data: { turbo_confirm: t("madmin.confirmations.delete", resource: resource.friendly_name, name: resource.display_name(@record)) }, class: "btn btn-danger" %>
+      <%= button_to t("madmin.actions.delete"), resource.show_path(@record), method: :delete, data: { turbo_confirm: resource.delete_confirmation(@record) }, class: "btn btn-danger" %>
     <% end %>
   </div>
 </header>

data/lib/generators/madmin/resource/templates/resource.rb.tt

@@ -26,6 +26,9 @@ class <%= class_name %>Resource < Madmin::Resource
   # Customize the display name of records in the admin area.
   # def self.display_name(record) = record.name
 
+  # Customize the confirmation shown before deleting a record. Return nil to skip it.
+  # def self.delete_confirmation(record) = "Delete #{record.name}? This can't be undone."
+
   # Customize the default sort column and direction.
   # def self.default_sort_column = "created_at"
   #

data/lib/madmin/menu.rb

@@ -45,7 +45,7 @@ module Madmin
       def items
         @children.values.sort do |a, b|
           result = a.position <=> b.position
-          result = a.human_label <=> b.human_label if result == 0 # sort alphabetically for the same position
+          result = a.label <=> b.label if result == 0 # sort alphabetically for the same position
           result
         end
       end
@@ -67,13 +67,6 @@ module Madmin
         @children = {}
       end
 
-      def human_label
-        @human_label ||= if label.is_a?(Symbol)
-          I18n.t("activerecord.models.#{label}", count: 2, default: [:"madmin.navigation.#{label}", label.to_s.pluralize(I18n.locale).titleize])
-        else
-          label
-        end
-      end
     end
   end
 end

data/lib/madmin/resource.rb

@@ -150,6 +150,14 @@ module Madmin
         "#{record.model_name.human} ##{record.id}"
       end
 
+      # Override for wording that needs more than the display name. Return nil to skip the confirmation.
+      def delete_confirmation(record)
+        I18n.t("madmin.resources.#{model.model_name.i18n_key}.confirmations.delete",
+          default: :"madmin.confirmations.delete",
+          resource: friendly_name,
+          name: display_name(record))
+      end
+
       def friendly_model?
         model.respond_to? :friendly
       end

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "3.3.1"
+  VERSION = "3.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jav_madmin
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Chris Oliver