templus_models 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b531514ac31823cc29637db8216e63b519bb8cd0
-  data.tar.gz: 48076b17649e28cdf40022c4e9c62da7825998ce
+  metadata.gz: 3e33084424f911dea9ac45f2cb2bb30f11fadd74
+  data.tar.gz: 10c67dd7009704c1c30d597760522a1eb3d51446
 SHA512:
-  metadata.gz: a49da204233098191f6e4dcd499baa0f2583c17ac3fb0f9ff5256e9e721bf8873516e3e5236fb15f69546421facd17064f81f900398fe3c9bffb11c8e6d8c987
-  data.tar.gz: 09c0e33ea8e3131230b5fcda03d1d7ad716367160efe509821507d5f4f7cf1dfcfd8c2be3f83ea27d505e871e2ae97a84ec51af1ebdfbbb1bbc8be36d9d813f3
+  metadata.gz: ea516b56ab9293307131f201cdd3ed655840790a887de435294d9a924b70034f430552d81bdbc5601ec152ec72ae163b0901cb83ca61ab7f99551f261196e9e8
+  data.tar.gz: bbf80c081f7d45735a93238abe1d4e50735958d3dc50f3372040a93a4a4db0f0a795a37ea472edbf71a4389c9b1d89f9708b1c64a522dcc12414ec199489927f

data/app/helpers/crud_helper.rb

@@ -129,7 +129,7 @@ module CrudHelper
       if !field[:sf][:edit].nil? && !field[:sf][:edit] && !record.new_record?
       elsif !field[:sf][:create].nil? && !field[:sf][:create] && record.new_record?
       else
-        opts = field[:sf].merge(label: I18n.t(field[:sf][:label]))
+        opts = field[:sf].merge(label: I18n.t(field[:sf][:label], default: I18n.t("shared.#{field[:attribute]}")))
         unless modelo.reflect_on_association(field[:attribute])
           if modelo.new.send(field[:attribute]).class.to_s =~ /Uploader/ and f.object.send(field[:attribute]).present?
             f.input field[:attribute], opts.merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
@@ -148,7 +148,7 @@ module CrudHelper
       if field[:sf][:collection_if] and field[:sf][:collection_if].class == Proc
          field[:sf][:collection] = f.instance_eval(&field[:sf][:collection_if])
       end
-      opts = field[:sf].merge(label: I18n.t(field[:sf][:label]))
+      opts = field[:sf].merge(label: I18n.t(field[:sf][:label], default: I18n.t("shared.#{field[:attribute]}")))
       unless modelo.reflect_on_association(field[:attribute])
         if modelo.new.send(field[:attribute]).class.to_s =~ /Uploader/ and f.object.send(field[:attribute]).present?
           f.input field[:attribute], opts.merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")

data/app/helpers/search_helper.rb

@@ -26,8 +26,8 @@ module SearchHelper
         modelo = Module.const_get(opts[:model])
         name = opts[:full_name]
       end
-      label = I18n.t("simple_form.labels.#{modelo.name.underscore}.#{name}")
-      label = I18n.t(opts[:label]) if opts[:label]
+      label = I18n.t("simple_form.labels.#{modelo.name.underscore}.#{name}", default: I18n.t("shared.#{name}"))
+      label = I18n.t(opts[:label], default: I18n.t("shared.#{name}")) if opts[:label]
 
       @buffer << "<div class=\"form-group\">"
       @buffer << raro_label(label,opts)

data/app/views/crud/_records.html.erb

@@ -15,17 +15,17 @@
             <th>
               <% if att[:sort_field].present? %>
                 <% if att[:sort_field] == :false %>
-                  <%= I18n.t(att[:label]) %>
+                  <%= I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")) %>
                 <% else %>
-                  <%= sort_link @q, att[:sort_field], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
+                  <%= sort_link @q, att[:sort_field], I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")), {},data: {push: 'partial', target: "#form"}%>
                 <% end %>
               <% else %>
-                <%= sort_link @q, att[:attribute], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
+                <%= sort_link @q, att[:attribute], I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")), {},data: {push: 'partial', target: "#form"}%>
               <% end %>
             </th>
           <% end %>
           <% if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present? %>
-            <td><%= I18n.t("simple_form.index.options") %></td>
+            <td><%= I18n.t("simple_form.index.options", default: I18n.t("options")) %></td>
           <% end %>
         </tr>
       </thead>

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

@@ -11,7 +11,7 @@
 									<% next %>
 								<% end %>
 							<% end %>
-							<th><%= I18n.t(field[:sf][:label]) %></th>
+							<th><%= I18n.t(field[:sf][:label], default: I18n.t("shared.#{field[:attribute]}")) %></th>
 
 							<% if @model.columns_hash[field[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[field[:attribute].to_s].type)%>
 								<% if field[:date_format].present?%>

data/app/views/crud/printing.pdf.erb

@@ -56,7 +56,7 @@
               <% if field[:sf].present? && field[:sf][:label].present? %>
                 <th><%= field[:sf][:label].to_s.mb_chars.upcase.to_s %></th>
               <% else %>
-                <th><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{field[:attribute]}") %></th>
+                <th><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{field[:attribute]}", default: I18n.t("shared.#{field[:attribute]}")) %></th>
               <% end %>
 
               <% if @model.columns_hash[field[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[field[:attribute].to_s].type) %>

data/app/views/layouts/_menu_crud.html.erb

@@ -1,5 +1,5 @@
-<%= menu_parent(raro_models, lista_menus_crud(raro_models), I18n.t("views.menu.entitys"), 'fa fa-book', true) do %>
+<%= menu_parent(raro_models, lista_menus_crud(raro_models), I18n.t("views.menu.cadastros"), 'fa fa-book', true) do %>
 	<% raro_models.each do |modelo| %>
 		<%= menu_crud_helper("#{modelo.name.underscore}_crud".camelize.constantize.title, modelo) %>
 	<% end %>
-<% end %>
+<% end %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.9"
+  VERSION = "3.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -980,7 +980,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects