madmin 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b6d17be04895373897532dcebc6ac0b3781b65a16b320f2bac5e518a9c1f1d
-  data.tar.gz: 06b1f2babd3bb74728444e9cb5f3ee4dee02878dc6c6adafa4199078d0b43d9b
+  metadata.gz: 2862cda2a9f7f8cc5313b205404c21bc4bd2e3a9aa780dfe6ba708ef0db51c34
+  data.tar.gz: a6dd1ac4898938c31ab694c61ca9c7ac379510b3ab00cc9830d8df43d651aff5
 SHA512:
-  metadata.gz: 3cfeb5f2835ad564f5f995ab37aad5c09ddc13441d93fca2fee1856d1eb1f9014b9966ca10a6e8982b4f0b35e36cedcc1b7f8300b6f96aeab2dfdccb14ae28dd
-  data.tar.gz: 276d179f98a51df5ab9cc6000436fecb1e09183bec64663127698921674d42753514505341b03e156f3c1df1007314954f38bd29304b2a75bb9bd83a565c24e6
+  metadata.gz: 8958ec3db4a60cd9df3484a9eb864f6b273ef646ae5a631f13cc16f0d7870147998193552de77c4cef6aad57bf3d97db8bd3f18fa213304f35b430f5d60ac8c7
+  data.tar.gz: d0eb3ec050476cdd04beec7d6ec2cb3a5a1a10d47dbab182b19236b2d8d3a0b90bebdbda04a0e8f5f875a2b695379095a3681470178669a9bc23ccdcb1e55a22

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

@@ -39,7 +39,7 @@
           <% next if attribute.field.nil? %>
           <% next unless attribute.field.visible?(action_name) %>
 
-          <th><%= sortable attribute.name, attribute.name.to_s.titleize %></th>
+          <th><%= sortable attribute.name, attribute.field.label %></th>
         <% end %>
         <th></th>
       </tr>

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

@@ -25,7 +25,7 @@
 
       <tr>
         <th class="label">
-          <%= attribute.field.options.label || attribute.name.to_s.titleize %>
+          <%= attribute.field.label %>
         </th>
 
         <td>

data/lib/madmin/field.rb

@@ -29,6 +29,10 @@ module Madmin
       attribute_name
     end
 
+    def label
+      options[:label].presence || attribute_name.to_s.titleize
+    end
+
     # Used for checking visibility of attribute on an view
     def visible?(action)
       action = action.to_sym

data/lib/madmin/resource.rb

@@ -54,15 +54,16 @@ module Madmin
         config = ActiveSupport::OrderedOptions.new.merge(options)
         yield config if block_given?
 
-        # Form is an alias for new & edit
-        if config.has_key?(:form)
-          config.new = config[:form]
-          config.edit = config[:form]
-        end
+        # Form is an alias for new & edit but shouldn't override their values if explicitly set (true/false)
+        config.new = config[:form] if config[:new].nil?
+        config.edit = config[:form] if config[:edit].nil?
 
         # New/create and edit/update need to match
-        config.create = config[:create] if config.has_key?(:new)
-        config.update = config[:update] if config.has_key?(:edit)
+        config.create = config.new
+        config.update = config.edit
+
+        # Remove any nil values to use the defaults
+        config.compact!
 
         attributes[name] = Attribute.new(
           name: name,

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Chris Oliver
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.12
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps
 test_files: []