templus_models 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cda944df741bea2aa0674649c8a5787cc2b6b6a
-  data.tar.gz: 38c3b388bf0b13e4eaa846c52ab69acfed11248c
+  metadata.gz: f40049a130be15773eb9bfbc66db8112331a7397
+  data.tar.gz: d5dab79cff5a21238652c28cd5992d933423ce14
 SHA512:
-  metadata.gz: 9688c08585b139a407dc4839421b8fd284e1ddab8e07040d1446f9c543b3e9e79857400f61200e7dfdebd07d009c0b1e5feee3b70048bdaa60fed02968f6242e
-  data.tar.gz: 665088cd90448ebea1709e600e43621a1121cd3b5fe67f2d04f1dd154e0aee61ba42f95c8cf3b4978c24cecc0caf724dceed7d30364ed15ae7c6a23cf285cbe5
+  metadata.gz: de03fcada6f4e9008e2d9314beea4aea5c15b3669d6b22e3cfdac8cfc93649267761da68b0fe7c418059e18b295ce67dbf7dcd8d3e8212f3935a490b36be30cb
+  data.tar.gz: d2717ff5a912d42edd7e07d14349594df4125201d0eceef951369ab7e78e5f7a46782625270675286458f78e60817a2eaf98e67da3e7861ccdf09fe1ea6e9de4

data/app/helpers/crud_helper.rb

@@ -131,7 +131,7 @@ module CrudHelper
       end 
     else
       if field[:sf][:value] and field[:sf][:value].class == Proc
-         field[:sf][:input_html] = {} 
+         field[:sf][:input_html] ||= {} 
          field[:sf][:input_html][:value] = f.instance_eval &field[:sf][:value] 
       end
       if field[:sf][:collection_if] and field[:sf][:collection_if].class == Proc

data/app/raro_crud/raro_crud.rb

@@ -293,7 +293,7 @@ class RaroCrud
      {campo: :complemento,  label: "Complemento"},
      {campo: :bairro,  label: "Bairro"},
      {campo: :estado,  label: "Estado", collection: Estado.order(:sigla).pluck(:sigla)},
-     {campo: :cidade_id,  label: "Cidade", collection_if: Proc.new{|f| f.try(:object).try(:new_record?) ? [] : (f.try(:object).try(:estado).try(:cidades) || [])}}
+     {campo: :cidade_id,  label: "Cidade", collection_if: Proc.new{|f| f.try(:object).try(:estado).try(:present?) ? (f.try(:object).try(:estado).try(:cidades) || []) : []}}
     ].each do |field|
       value = {}
       field.each do |atr|

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

@@ -28,9 +28,9 @@
 		
 	<% end %>
 	<%@crud_helper.form_groups.each do |key, groups|%>
-		<% if [:has_many,:has_and_belongs_to_many].include?(@model.reflect_on_association(key).macro) && @record.new_record? %>
+		<% if [:has_many,:has_and_belongs_to_many].include?(@model.reflect_on_association(key).macro) && @record.new_record? && !@record.send(key).present? %>
 			<% @record.send(key).build %>
-		<% elsif @record.new_record?%>
+		<% elsif @record.new_record? && !@record.send(key).present?%>
 				<% @record.send("build_#{key}") %>
 		<% end %>
 		<%= f.simple_fields_for key do |g| %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

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