templus_models 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8acf3763afa3c7ceeeadefb3b9fb7c764e71ddc
-  data.tar.gz: 80fbf163d02171dd6d380c12e8384c44c6f3fdc6
+  metadata.gz: c3fd9b4ef6ae55f12405a64449d066e8db7d9236
+  data.tar.gz: e6f38b2cbdf2aeb53f9b401628d7c0a1f4f84e10
 SHA512:
-  metadata.gz: fac4a3607dfccd37eb96af5710bd181cabebaa96f1bf6f0b3c0ecbfcc8bf5f0df91a24ad54bb79aafa3694d9eedb3ad022ca6ec2e5d9b4a57a58241fa93a224c
-  data.tar.gz: 278edfee365328d8f4f7751d9d05d96cb35a476009ae42eb2786fe0e4395ea0596c8e63482543e25e4d72eefa1eda704f78425b0254d8685f1fe5b7172f4b24c
+  metadata.gz: 569fbc02c2feb33f7b4111f4ec172f640be08975f34b7c3c6611fb05bfb0173b0fe02b671ce0f1ae051ae7856c0091c0e969a0503d04949bb572769ea3ec928d
+  data.tar.gz: 7a1956a5c9e3081cab607e12074ffffb2ec053d5afe4c33af50e5bcf64946f5ec894996139033acdb0a2b979039a987a76b7814d43b82e548ff9705599eda5b4

data/app/controllers/crud_controller.rb

@@ -151,11 +151,11 @@ class CrudController < ApplicationController
     @crud_helper.form_fields.each do |field|
       if @model.reflect_on_association(field[:attribute])
         if @model.reflect_on_association(field[:attribute]).macro == :belongs_to
-          fields << "#{field[:attribute]}_id".to_sym
+          fields << @model.reflect_on_association(field[:attribute]).foreign_key
         else
           fields << {"#{field[:attribute].to_s.singularize}_ids".to_sym => []}
         end
-      elsif (@model.columns_hash[field[:attribute].to_s] || (@model.respond_to?(:params_permitt) && @model.params_permitt.include?(field[:attribute].to_sym)))
+      elsif @model.columns_hash[field[:attribute].to_s]
         fields << field[:attribute]
       end
     end
@@ -176,6 +176,11 @@ class CrudController < ApplicationController
       end
       fields << group
     end
+    if @model.respond_to?(:params_permitt)
+      @model.params_permitt.each do |field|
+        fields << field
+      end
+    end
     fields
   end
 end

data/app/helpers/crud_helper.rb

@@ -118,11 +118,15 @@ module CrudHelper
     if field[:sf].present? && field[:sf][:if].present?
       return unless field[:sf][:if].call(f.object)
     end
+    if field[:sf].present? && field[:sf][:date_format].present? && f.object.send(field[:attribute]).present? && Date <= modelo.columns_hash[field[:attribute].to_s].type.to_s.camelcase.constantize
+      field[:sf][:input_html] ||= {}
+      field[:sf][:input_html][:value] = f.object.send(field[:attribute]).strftime(field[:sf][:date_format])
+    end
     if !field[:sf][:edit].nil? || !field[:sf][:create].nil?
       if !field[:sf][:edit].nil? && !field[:sf][:edit] && !record.new_record?
       elsif !field[:sf][:create].nil? && !field[:sf][:create] && record.new_record? 
       else 
-        unless modelo.reflect_on_association(field[:attribute]) 
+        unless modelo.reflect_on_association(field[:attribute])
            f.input field[:attribute], field[:sf]
         else 
            f.association field[:attribute], field[:sf]

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

@@ -1,5 +1,10 @@
 <%= content_tag :tr, id: "record-#{record.id}" do %>
 	<%@crud_helper.index_fields.each do |att| %>
+		<% if !att[:visible_if].nil?%>
+			<% if ((att[:visible_if].class == Proc && !att[:visible_if].call(att)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
+				<% next %>
+			<% end %>
+		<% end %>
 		<% if record.send(att[:attribute]).present? or record.send(att[:attribute]).to_s == "false"%>
 			<% if @model.columns_hash[att[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[att[:attribute].to_s].type)%>
 					<% if att[:date_format].present?%>

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

@@ -7,6 +7,11 @@
 			<thead>
 				<tr>
 					<%@crud_helper.index_fields.each do |att|  %>
+					<% if !att[:visible_if].nil?%>
+						<% if ((att[:visible_if].class == Proc && !att[:visible_if].call(att)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
+							<% next %>
+						<% end %>
+					<% end %>
 					<th>
 						<% if att[:sort_field].present? %>
 							<%= sort_link @q, att[:sort_field], att[:label], {},data: {push: 'partial', target: "#form"}%>

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

@@ -11,6 +11,11 @@
 				<%=raro_search_form(@model, 'records','records',"/crud/#{@model.name.underscore}/query") do%>
 					<%raro_group "#{@model.name}"%>
 					<%@crud_helper.search_fields.each do |att| %>
+						<% if att[:sf].present? && !att[:sf][:visible_if].nil?%>
+							<% if ((att[:sf][:visible_if].class == Proc && !att[:sf][:visible_if].call(att)) || (att[:sf][:visible_if].class != Proc && !att[:sf][:visible_if])) %>
+								<% next %>
+							<% end %>
+						<% end %>
 						<%raro_field att[:attribute],att[:sf]%>
 					<%end%>
 				<%end%>

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

@@ -6,6 +6,11 @@
 				<tbody>
 					<% @crud_helper.view_fields.each do |field|%>
 						<tr>
+							<% if field[:sf].present? && !field[:sf][:visible_if].nil?%>
+								<% if ((field[:sf][:visible_if].class == Proc && !field[:sf][:visible_if].call(field)) || (field[:sf][:visible_if].class != Proc && !field[:sf][:visible_if])) %>
+									<% next %>
+								<% end %>
+							<% end %>
 							<% if field[:sf].present? && field[:sf][:label].present? %>
 								<th><%= field[:sf][:label].upcase.to_s %></th>
 							<% else %>
@@ -22,16 +27,16 @@
 									<% @record.send(field[:attribute]).each do |rec| %>
 									<li>
 										<% if field[:sf].present? && field[:sf][:label_method].present? %>
-										<% if rec.send(field[:sf][:label_method]).respond_to?(:url) %>
-										<%= render_field_file(rec.send(field[:sf][:label_method])) %>
-										<% else %>
-										<%= rec.send(field[:sf][:label_method]) %>
-										<% end %>
+											<% if rec.send(field[:sf][:label_method]).respond_to?(:url) %>
+												<%= render_field_file(rec.send(field[:sf][:label_method])) %>
+											<% else %>
+												<%= rec.send(field[:sf][:label_method]) %>
+											<% end %>
 										<% else %>
-										<% if rec.to_s.respond_to?(:url) %>
-										<%= render_field_file(rec.to_s) %>
+											<% if rec.to_s.respond_to?(:url) %>
+												<%= render_field_file(rec.to_s) %>
 										<% else %>
-										<%= rec.to_s %>
+											<%= rec.to_s %>
 										<% end %>
 										<% end %>
 									</li>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.3.4"
+  VERSION = "1.3.6"
 end

data/test/dummy/app/models/ability.rb

@@ -15,7 +15,7 @@ class Ability
       # can :read, Teste
     else
       #Permissão global
-      can :manage, Dashboard
+      # can :manage, Dashboard
 
       # #Permissão fixa
       # case usuario.papel.chave
@@ -23,8 +23,8 @@ class Ability
       # end
 
       #Permissão dinamica
-      if usuario.papel
-        usuario.papel.permissoes.each do |permissao|
+      if usuario.perfil
+        usuario.perfil.permissoes.each do |permissao|
           # if usuario.reference_id.present? && permissao.klass.constantize.attribute_method?(:reference_id)
             can permissao.abilities, permissao.klass.constantize, reference_id: usuario.reference_id
           # else

data/test/dummy/app/raro_crud/usuario_crud.rb

@@ -8,7 +8,7 @@ class UsuarioCrud < RaroCrud
   ordenar_por :nome
   edicao Proc.new {|obj| !obj.root? }
   exclusao Proc.new {|obj| !obj.root? }
-  visualizacao Proc.new {|obj| obj.root? }
+  visualizacao Proc.new {|obj| !obj.root? }
 
   campo_tabela :nome,  label: "Nome"
   campo_tabela :email, label: "email"
@@ -21,10 +21,10 @@ class UsuarioCrud < RaroCrud
 
   campo_visualizacao :nome,  label: "Nome"
   campo_visualizacao :email, label: "email"
-  campo_visualizacao :perfil, label: "Papel"
+  campo_visualizacao :perfil, label: "Papel", visible_if: Proc.new {Usuario.current.root? }
 
   campo_busca :nome,  label: "Nome"
   campo_busca :email, label: "email"
-  campo_busca :papel_id,  label: "Papel"
+  campo_busca :papel_id,  label: "Papel", visible_if: Proc.new {Usuario.current.root? }
 
 end

metadata

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