zutils 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9eb74781bf8db14a1333f5f644b29cf11516e1bbf794b5905de9f9c18ca4c4
-  data.tar.gz: 2bd41f7c6d6f9a20f99189d92cc380cf0621a06c8b2394c8784455f1088edcb7
+  metadata.gz: bff9fb81ac8f0156f7d46644f0da08d0324b413f72ab8a2fc293d2963bafed93
+  data.tar.gz: a5ab72d937c600876d05e1dcceca038bb08873077e7760170b0a89a486326649
 SHA512:
-  metadata.gz: 56d2f7933b7b28722a406d909f9c5db701ee0aaeca5fd38496689e0e03ef10e480d6ed09531aa343a5eaa4d8aa92809140770c034c5268276ba20cd60e263b01
-  data.tar.gz: 5bc42418e918437043db8ef865a2ae807d3ed4da7b2c8f95ad597e1b2d8ee2c23fb7705f590e269996cf60ba7421fb7cc8c5f437dbaadf000d4ae230a4e2a58a
+  metadata.gz: 33345cf00d787c3c7c5ea059c2e6d671071e62b6331492a5f799e9bd6c1493a51dcb577da6bb57f74701c3b1bef37c08c22206ee73ffb04d2798b9ab7c537a70
+  data.tar.gz: b980a28133573afad4290a1f7e1124182e44fe4a4d12da0c7cdddf727c7873650faf0e4997f16168be76e88fa719db69080eb602eec999b1e3b434843fb0e4a9

data/app/views/shared/_list.html.erb

@@ -39,9 +39,11 @@
         <th data-field="<%= column_method || column_name %>" data-align="<%= column_align %>">
           <% if sort_all || sort_fields.include?(column_name) %>
             <% if column_name.include?('.') %>
-              <% s_name = column_method || column_name %>
-              <%= sort_link(@q, s_name.split('.').join('_'),
-                "#{s_name.split('.')[-2]&.camelize} (#{s_name.split('.')[-1]})")
+              <% mname = column_name.split('.')[-2]&.camelize %>
+              <% cname = column_name.split('.')[-1] %>
+              <% model = Kernel.const_get(mname) %>
+              <%= sort_link(@q, column_name.split('.').join('_'),
+                "#{model.model_name.human} (#{model.human_attribute_name(cname)})")
               %>
             <% elsif /_id$/ =~ column_name %>
               <%= sort_link(@q, column_name, list.klass.human_attribute_name(column_name.split("_id")[0])) %>
@@ -92,9 +94,13 @@
 
           <td>
             <% if column_name.include?('.') %>
-              <% o = object %>
-              <% column_name.split('.').each{|m| o = o.send(m) if o } %>
-              <%= o %>
+              <% if column_method.nil? %>
+                <% o = object %>
+                <% column_name.split('.').each{|m| o = o.send(m) if o } %>
+                <%= o %>
+              <% else %>
+                <%= object.send(column_method) %>
+              <% end %>
             <% elsif object.send(column_name).class == Date or
               object.send(column_name).class == DateTime or
               object.send(column_name).class == ActiveSupport::TimeWithZone or

data/lib/zutils/version.rb

@@ -1,3 +1,3 @@
 module Zutils
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zutils
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails