zutils 1.1.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9eb74781bf8db14a1333f5f644b29cf11516e1bbf794b5905de9f9c18ca4c4
-  data.tar.gz: 2bd41f7c6d6f9a20f99189d92cc380cf0621a06c8b2394c8784455f1088edcb7
+  metadata.gz: 4f4676ffa4289aaa630608de27b2156473f7337c0c850598e3f7bb79fb7397ba
+  data.tar.gz: 7c0294692a429bc75b007bbc845b1deaf88164b1384adcc9667ea33baaf266f2
 SHA512:
-  metadata.gz: 56d2f7933b7b28722a406d909f9c5db701ee0aaeca5fd38496689e0e03ef10e480d6ed09531aa343a5eaa4d8aa92809140770c034c5268276ba20cd60e263b01
-  data.tar.gz: 5bc42418e918437043db8ef865a2ae807d3ed4da7b2c8f95ad597e1b2d8ee2c23fb7705f590e269996cf60ba7421fb7cc8c5f437dbaadf000d4ae230a4e2a58a
+  metadata.gz: 1c28a400899038fa78a122d3b14e4d029b2ee139cd603d8448d59c9cd1597abe3d1f1a6b64f7ecdf25f480a9d0acb71f02fb7f2d8508164c8600fcc53918cd2b
+  data.tar.gz: 3f3c5ab944e70a2fa4d287c7e6ab3fe7e75b4789a712956cf994efdfa6076d5e5901a4efbc14f71608c750b1440778c2b9b995f7dd4471dfdfbed408f25b774e

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

@@ -17,6 +17,7 @@
 <% hide_footer ||= false %>
 
 <% hide_read_action ||= false %>
+<% hide_new_action ||= false %>
 <% hide_edit_action ||= false %>
 <% hide_destroy_action ||= false %>
 
@@ -68,7 +69,7 @@
   <% unless hide_links %>
     <% unless controller_name == 'users' %>
       <div class="box-footer card-footer">
-        <% if can? :new, list.klass %>
+        <% if !hide_new_action && can?(:new, list.klass) %>
           <% if nested_resource == true %>
             <% if parent_resource %>
               <%= link_to eval("new_#{parent_resource.class.model_name.singular}_#{list.klass.model_name.singular}_path(#{parent_resource.id})"), class: "btn btn-#{box_class}" do %>

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/app/views/shared/_show.html.erb

@@ -34,8 +34,14 @@
             <% end %>
           <% end %>
           <% if show_actions.include?('edit') && can?(:edit, object) %>
-            <%= link_to eval_with_rescue("edit_#{object.class.model_name.singular}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
-              Editar <i class="fa fa-pencil fa-pen"></i>
+            <% if nested_resource %>
+              <%= link_to eval_with_rescue("edit_#{parent_resource.class.model_name.singular}_#{object.class.model_name.singular}_path(#{parent_resource.id},#{object.id})"), class: "btn btn-#{box_class} btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
+                Editar <i class="fa fa-pencil fa-pen"></i>
+              <% end %>
+            <% else %>
+              <%= link_to eval_with_rescue("edit_#{object.class.model_name.singular}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
+                Editar <i class="fa fa-pencil fa-pen"></i>
+              <% end %>
             <% end %>
           <% end %>
           <% if show_actions.include?('index') %>
@@ -165,7 +171,7 @@
           </table>
         </div>
       </div>
-    <% else %>  
+    <% else %>
       <div class="box box-<%= box_class %>">
         <div class="box-header with-border">
           <h3 class="box-title">

data/lib/zutils/version.rb

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

data/zutils.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '~> 6.0'
+  spec.add_dependency 'rails', '>= 5.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zutils
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Utilidades gerais para aplicações rails