templus_models 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec9f6718520ae99d686f122694a1fe37cfab627
-  data.tar.gz: 3a4e215f8924c5db90173309119bb62ea7b5ed51
+  metadata.gz: 1d5f40c5d477a3f89c62e865f78829b10459c71e
+  data.tar.gz: 196f38866cd729c07c2997aa3dc96be3ea8e9fec
 SHA512:
-  metadata.gz: 8608adf4e91b264bbb95b0627652ff9d9b75e76627e27adcb41503d3c83a5342b7c8bf3388d1e782671836b37eac6a71ee0e3dc4266441a9c182e493260daca6
-  data.tar.gz: fe47911c91fbcb6e01ab695a448a08aef4ae65dba576fa85530466cda9e5cd36f660332457cb38b58f6aa180601d03124858f99d5de78532fc4189a11a1087c1
+  metadata.gz: 4c8391370ca672bb1801c8796de51046c501f474dfd613c53aaf5caf2eea9eb8c77db6713dc2ac912bf89b3a5bb3e2b03f3f7df5bcdc3444ed2f9ee6e5918b74
+  data.tar.gz: fdcf411a09b2fd67d6ba1c9d3e4fe605b151599828f2b179f6a599f0907c6f3ba59e50a2050ce5349fbea765b0181d78ff13a20775d1386d685843b274095785

data/app/controllers/crud_controller.rb

@@ -204,7 +204,7 @@ class CrudController < ApplicationController
     group = {chave => [:id, :_destroy]}
     groups.each do |field|
       if field[:sf].present? && field[:sf][:grupo].present?
-        group[chave] << permitt_group(fields, field[:attribute], field[:sf][:fields], key.to_s.camelcase.singularize.constantize)
+        group[chave] << permitt_group(fields, field[:attribute], field[:sf][:fields], mod.reflect_on_association(key.to_s).class_name.constantize)
       else
         modelo = mod.reflect_on_association(key.to_s).class_name.constantize
         if modelo.reflect_on_association(field[:attribute])

data/app/helpers/crud_helper.rb

@@ -128,7 +128,11 @@ module CrudHelper
       elsif !field[:sf][:create].nil? && !field[:sf][:create] && record.new_record? 
       else 
         unless modelo.reflect_on_association(field[:attribute])
-           f.input field[:attribute], field[:sf]
+          if modelo.new.send(field[:attribute]).class.to_s =~ /Uploader/ and f.object.send(field[:attribute]).present?
+            f.input field[:attribute], field[:sf].merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
+          else
+            f.input field[:attribute], field[:sf]
+          end
         else 
            f.association field[:attribute], field[:sf]
         end 
@@ -142,7 +146,11 @@ module CrudHelper
          field[:sf][:collection] = f.instance_eval &field[:sf][:collection_if]
       end
       unless modelo.reflect_on_association(field[:attribute])
-        f.input field[:attribute], field[:sf]
+        if modelo.new.send(field[:attribute]).class.to_s =~ /Uploader/ and f.object.send(field[:attribute]).present?
+          f.input field[:attribute], field[:sf].merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
+        else
+          f.input field[:attribute], field[:sf]
+        end
       else 
         f.association field[:attribute], field[:sf]
       end 

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

@@ -24,7 +24,7 @@
 	<% if [:has_many,:has_and_belongs_to_many].include?(f.object.class.reflect_on_association(key).macro) %>
 		<div class="form-group">
 			<div class="col-sm-10 col-sm-offset-2">
-				<%= g.link_to_remove "Remover #{groups[:label].downcase}" %>
+				<%= g.link_to_remove "Remover #{groups[:sublabel] || groups[:label].downcase}" %>
 			</div>
 		</div>
 	<% end %>
@@ -32,7 +32,7 @@
 <% if [:has_many,:has_and_belongs_to_many].include?(f.object.class.reflect_on_association(key).macro) %>
 	<div class="form-group">
 		<div class="col-sm-12">
-			<%= f.link_to_add "Adicionar #{groups[:label].downcase}", key %>
+			<%= f.link_to_add "Adicionar #{groups[:sublabel] || groups[:label].downcase}", key %>
 		</div>
 	</div>
 <% end %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails