zutils 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697a24c552f8462206708e0f6e57b49ddf3a5d16463dac33f2801918e537f499
-  data.tar.gz: 8f44c1db6f911795b5a7a84a028f9be91816450af2d44debff1588a590562561
+  metadata.gz: 0036a059b0a5365040cc5177473f248fdf162ac323adc606a88d71e76e864e62
+  data.tar.gz: bda990502625e46533c264516f6d0fef82821f3ddba0a919a1a314715f98bfab
 SHA512:
-  metadata.gz: 73f8317d8dacbc157892212a080e62ced6b7243aff56a8fdba59ab1868a879efba99e39a0aa6b1e677443a0a88f57fd42dc56e114452339f200298fc2b11b227
-  data.tar.gz: 1ed5a270e3e0258a564506d330a22beb7184727ac0caf70e103898f677fba8d5bd86d9943e31d6013845d0e1e712c41a44ca54dc075769e07a24217ef74c2e9c
+  metadata.gz: 3cd01ca929a8c7c1559fff179077ff9c099b0f757381327a1a151df2a35022c84e41fd7681362b05fcf2aeb52ff82d8a89ca59c8998f2463400bdff7db177a09
+  data.tar.gz: 80ec6c2a9a0b79cabaef9bc6e900282c5de9f2cef76e51e6b25c4b96b8a3e477edb78f1637c8e3e03deefbd8721f83994b25264308bfc5d54ed8f43a7afc071b

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

@@ -3,12 +3,15 @@
 <% hide_actions ||= false %>
 <% sort_fields ||= [] %>
 
+<% form_fields ||= (list.first.class.respond_to?('form_fields') ? list.first.class.form_fields : {}) %>
+<% form_ordered_fields ||= (form_fields.empty? ? list.first.class.column_names : form_fields.keys) %>
+
 <table class="table table-striped datatables">
   <thead>
     <tr>
       <% unless list.empty? %>
-        <% (list.first.class.column_names - exceptions - excluded_columns).each do |column| %>
-          <% if sort_fields.include? column %>
+        <% (form_ordered_fields - exceptions - excluded_columns).each do |column| %>
+          <% if sort_fields.include?(column) || sort_fields.include?(column.to_s) || sort_fields.include?(column.to_sym)  %>
             <% if /_id$/ =~ column %>
               <th><%= sort_link(@q, column, list.first.class.human_attribute_name(column.split("_id")[0])) %></th>
             <% else %>
@@ -31,7 +34,7 @@
   <tbody>
     <% list.each do |object| %>
     <tr>
-      <% (list.first.class.column_names - exceptions - excluded_columns).each do |column| %>
+      <% (form_ordered_fields - exceptions - excluded_columns).each do |column| %>
       <td>
         <% if object.send(column).class == Date or
           object.send(column).class == DateTime or

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

@@ -3,6 +3,7 @@
 <% relationships ||= {} %>
 <% box_class ||= 'primary' %>
 <% display_mode ||= 'table' %>
+<% show_buttons &&= true %>
 
 <% form_fields ||= (object.class.respond_to?('form_fields') ? object.class.form_fields : {}) %>
 <% form_ordered_fields ||= (form_fields.empty? ? object.class.column_names : form_fields.keys) %>
@@ -10,15 +11,17 @@
 <div class="box box-<%= box_class %>">
   <div class="box-header with-border">
     <h3 class="box-title"><%=t object.class.model_name.human %></h3>
-    <% if can? :edit, object %> <!--verificando se o usuario esta logado-->
-      <%= link_to eval_with_rescue("edit_#{controller_name.singularize}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
-        <i class="fa fa-pencil"></i> Editar
+    <% if show_buttons %>
+      <% if can? :edit, object %> <!--verificando se o usuario esta logado-->
+        <%= link_to eval_with_rescue("edit_#{controller_name.singularize}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
+          <i class="fa fa-pencil"></i> Editar
+        <% end %>
+      <% end %>
+      <% if nested_resource %>
+        <%= link_to 'Listagem', eval_with_rescue("#{parent_resource.class.model_name.to_s.downcase}_#{controller_name}_path(#{parent_resource.id})"), class: "btn btn-default btn-xs" %>
+      <% else %>
+        <%= link_to 'Listagem', eval_with_rescue("#{controller_name}_path"), class: "btn btn-default btn-xs" %>
       <% end %>
-    <% end %>
-    <% if nested_resource %>
-      <%= link_to 'Listagem', eval_with_rescue("#{parent_resource.class.model_name.to_s.downcase}_#{controller_name}_path(#{parent_resource.id})"), class: "btn btn-default btn-xs" %>
-    <% else %>
-      <%= link_to 'Listagem', eval_with_rescue("#{controller_name}_path"), class: "btn btn-default btn-xs" %>
     <% end %>
   </div>
   <div class="box-body <%= 'no-padding' if display_mode == 'table' %>">

data/lib/zutils/version.rb

@@ -1,3 +1,3 @@
 module Zutils
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zutils
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails