five-two-nw-olivander 0.1.2.26 → 0.1.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d96cd91f2f4830a4cfe85a04cfac5bc30eb3460a0305bca7efb350f35c4e581
-  data.tar.gz: 23d8592c86e3ba64edc0a666b05bbcda1847365b1d4a23233cf0d7134995c225
+  metadata.gz: 575201e4ba97a06d33425fffb69b3550f2c3fddc58e1ccb030a827914cbd65f0
+  data.tar.gz: e1570ff90c9a44764ea6c8e5d8b269d6482377c47010c36475eeabbbfcb5e1e1
 SHA512:
-  metadata.gz: 2806dca34a1cbccd23d2f9efbae8bf18365ab492fa714b9bb6b3f0451a5752a5e1a59be0f39e2b4cf3b1ad70bfafc9bf373c6a6cab2fef9cadb229b832f5e9e0
-  data.tar.gz: 69338f7e7fd4dcf122316bf5de2c3d7e7ced36b3a47d2797bbfa6f89a20130a886a3069a570129560559678f636a8af777a2298473b6b2f5ae7971e05cb7daa8
+  metadata.gz: 97a5958aab8927d392183d9aea8b193491bf346af4a65fadc9faa96a4f57a54478e7a7247060ca0ec84a25fe7b09dd0c063001f5ae8dc50f59bdb03e86b1475a
+  data.tar.gz: 3c237985f2aee2131498cbf501734aa9d517f7827eee5d23fb0549452c0d96aadd2913f66269e937a0ae9b5280654c39d3bd179f203b7f42ea7af49584481b7d

data/app/datatables/olivander/datatable.rb

@@ -40,12 +40,14 @@ module Olivander
         bulk_actions_col
         column_attributes.each do |key|
           label = field_label_for(klazz, key)
-          sym = key.gsub('_id', '').to_sym
+          sym = key.gsub('_id', '')  #.to_sym
           visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
           if link_path.present? && sym == :id
             link_col sym, link_path, :id, visible: visible
           elsif link_path.present? && sym == :name
             link_col sym, link_path, :id, visible: visible
+          elsif sym.include?('.')
+            col sym, visible: visible, label: label
           else
             col sym, visible: visible, label: label
           end

data/app/helpers/olivander/application_helper.rb

@@ -79,7 +79,8 @@ module Olivander
     end
 
     def field_label_for(resource_class, sym)
-      i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.#{sym}"
+      sym_s = sym.to_s.gsub('.', '_')
+      i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.#{sym_s}"
       return I18n.t(i18n_key) if I18n.exists?(i18n_key)
 
       sym.to_s.titleize
@@ -130,7 +131,7 @@ module Olivander
         key
       end
     end
-  
+
     def flash_icon key
       case key
       when "error"
@@ -144,6 +145,6 @@ module Olivander
       else
         "fas fa-question-circle"
       end
-    end  
+    end
   end
 end

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.26'.freeze
+  VERSION = '0.1.2.27'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.26
+  version: 0.1.2.27
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick