templus_models 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c12296c8400033403d2b8d6fbc92ec1e2bf7e4
-  data.tar.gz: c33c018adc1a471c2a5708181af3b8205cd248b7
+  metadata.gz: 847842e4b4a56634d3e81a0b8a769458f9e77bee
+  data.tar.gz: 252d5dd7435561f3d779f425e6fc087ce9f73ceb
 SHA512:
-  metadata.gz: 941843452f414329c9a2a025e54b7ecb381e339e181c70bc03736b66313b71e9308087261a5675fbbb491e6dccbdf57a95718b1e82a2fcc61471ad9792f2d0b9
-  data.tar.gz: 5f6764c23d9967b6c0c4b9c9cf2da3cf2783554299558cdf593809118729d2e47d2ba8446c3c6a2b2e887bca4c687a48f6c92a5bbaaac1759051c59d0b7145c9
+  metadata.gz: 170d5fb7e1a7f7326d224ed32f91c6a18c9840d9bf1721f23ddee5de7069ee0ce16259672ebb4f61bb38628f26d084c0caee008c076dc80d7c06906b1b85cfa5
+  data.tar.gz: 93df9fdb247590d6f857a2d120ce7cceeb34f3aea9def401951693f344bd2b4695592481ca5e3f313faabc91dd609e420d212a9bd563740f44de42107dfa1c5a

data/app/controllers/crud_controller.rb

@@ -26,11 +26,10 @@ class CrudController < ApplicationController
 
   def setup
     @model = Module.const_get(params[:model].camelize)
-    @crud_helper = Module.const_get("#{params[:model]}_crud".camelize)
+    @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
   end
   
   def new
-    authorize! :new, @model if respond_to?(:current_usuario)
     if params[:render] == "modal"
       if @model.reflect_on_association(params[:attribute].to_s).present?
         @model = @model.reflect_on_association(params[:attribute].to_s).class_name.constantize
@@ -38,6 +37,7 @@ class CrudController < ApplicationController
         @model = params[:attribute].to_s.camelcase.constantize
       end
     end
+    authorize! :new, @model if respond_to?(:current_usuario)
     @crud_helper = Module.const_get("#{@model}Crud".camelize)
     @record = @model.new
   end

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

@@ -20,6 +20,9 @@
 	<%= simple_nested_form_for @record, remote: remote_form, html: {class: "form-horizontal"}, url: url do |f| %>
 		<%= flash_messages_error(@record.errors) %>
 		<%@crud_helper.form_fields.each do |field|%>
+			<% if field[:sf].present? && field[:sf][:if].present? %>
+				<% next unless field[:sf][:if].call(f.object) %>
+			<% end %>
 			<% if field[:sf].present? && field[:sf][:grupo].present? %>
 				<%= render "/crud/form_group", f: f, key: field[:attribute], groups: field[:sf] %>
 			<% else %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails