templus_models 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e5413045e53b19661f659bebb9b87f050a12dd
-  data.tar.gz: 91595263113973c97aca2ec486e76cda7d6d3be6
+  metadata.gz: bfad85131bd19efb453328996e69385d9e4c9342
+  data.tar.gz: c8d4b46fddeda767f28b832c3ca9bd460a0aa74d
 SHA512:
-  metadata.gz: 0edadf0231626d5bfeeb3ce0c2eb45c4753d85c6fdd7f1915c9f7853f10eb6255ac9868fcc29d51a8b3ab049d5595744e0e4c845290c3cd6d40b32ce8b142c34
-  data.tar.gz: 6b28f98a08d8da8b056b2c0117e6632fec359a30c1d6387ce9c61dca601fff50a413c4764217c8abf74f74783e4f6fc781cd68a11694f9c480a40917c5cb2993
+  metadata.gz: 603316b3e62cc51bda580620a885b7731056106c9a7902735f5d0c6d7b6295b41d6cef997e200f49a37a2e7679fdd0bb7f24578efa61f6e7be1120395bd8a9aa
+  data.tar.gz: 483f928f955f6803c94c099bb0e70148848b9ebde9a18da9b2fcc68eb8abeb1773e392fb18e82b29731354e146b13747eda17428c6c2cb7ec8507ceff6df48e7

data/app/assets/javascripts/raro_crud.js

@@ -21,6 +21,9 @@ function new_record(id,name){
 					text: entity_desc,
 					selected: 'selected'
 				}));
+				if($('#' + id).hasClass("chosen")){
+					$('#' + id).trigger("chosen:updated");
+				}
 				$(model_target).attr('data-saved','false');
 				$(model_target).attr('data-entity-name','')
 				$(model_target).attr('data-entity-id','')

data/app/helpers/crud_helper.rb

@@ -8,13 +8,13 @@ module CrudHelper
       params[:action] == action_name ? "active" : nil
   end
   
-  def is_raro_crud(attribute)
+  def is_raro_crud(classe)
     #if(Rails.env == "production")
     #  @@cruds = Dir[Rails.root.join("app","raro_crud","*.rb")].map{|f| f.split(/\//).last.gsub(/_crud\.rb/,'')} unless @@cruds
     #else
       @@cruds = Dir[Rails.root.join("app","raro_crud","*.rb")].map{|f| f.split(/\//).last.gsub(/_crud\.rb/,'')}
     #end
-    return @@cruds.include?(attribute.to_s)
+    return @@cruds.include?(classe.underscore.to_s)
   end
   
   def lista_menus_crud(raro_models)
@@ -109,6 +109,7 @@ module CrudHelper
   end
     
   def render_field(field,f,modelo,record)
+    field[:sf][:wrapper] ||= :default
     if field[:sf].present? && field[:sf][:if].present?
       return unless field[:sf][:if].call(f.object)
     end
@@ -167,4 +168,18 @@ module CrudHelper
   def render_default_actions_crud
     render "default_actions_crud"
   end
+  
+  #Permissions
+  def shold_view?(crud_helper,record)
+    return true if crud_helper.condition_view_action.nil?
+    crud_helper.condition_view_action.call(record)
+  end
+  def shold_edit?(crud_helper,record)
+    return true if crud_helper.condition_edit_action.nil?
+    crud_helper.condition_edit_action.call(record)
+  end
+  def shold_destroy?(crud_helper,record)
+    return true if crud_helper.condition_destroy_action.nil?
+    crud_helper.condition_destroy_action.call(record)
+  end
 end

data/app/raro_crud/raro_crud.rb

@@ -1,26 +1,29 @@
 class RaroCrud
-  @@order_field       = {}
-  @@per_page          = {}
-  @@index_fields      = {}
-  @@form_fields       = {}
-  @@form_group        = {}
-  @@form_scripts      = {}
-  @@view_fields       = {}
-  @@search_fields     = {}
-  @@test_fields       = {}
-  @@top_links         = {} 
-  @@title             = {}
-  @@subtitle_index    = {}
-  @@description_index = {}
-  @@actions           = {}
-  @@links             = {}
-  @@edit_action       = {}
-  @@destroy_action    = {}
-  @@view_action       = {}
-  @@options_link      = {}
-  @@scopes            = {}
-  @@menus             = []
-  @@index_path        = nil
+  @@order_field               = {}
+  @@per_page                  = {}
+  @@index_fields              = {}
+  @@form_fields               = {}
+  @@form_group                = {}
+  @@form_scripts              = {}
+  @@view_fields               = {}
+  @@search_fields             = {}
+  @@test_fields               = {}
+  @@top_links                 = {} 
+  @@title                     = {}
+  @@subtitle_index            = {}
+  @@description_index         = {}
+  @@actions                   = {}
+  @@links                     = {}
+  @@edit_action               = {}
+  @@condition_edit_action     = {}
+  @@destroy_action            = {}
+  @@condition_destroy_action  = {}
+  @@view_action               = {}
+  @@condition_view_action     = {}
+  @@options_link              = {}
+  @@scopes                    = {}
+  @@menus                     = []
+  @@index_path                = nil
 
   def self.edit_action
     if @@edit_action[self.to_s.to_sym] == false
@@ -30,6 +33,10 @@ class RaroCrud
     end
   end
   
+  def self.condition_edit_action
+    (@@condition_edit_action[self.to_s.to_sym]) ? @@condition_edit_action[self.to_s.to_sym] : nil
+  end
+  
   def self.destroy_action
     if @@destroy_action[self.to_s.to_sym] == false
       return false
@@ -37,6 +44,10 @@ class RaroCrud
       return true
     end
   end
+  
+  def self.condition_destroy_action
+    (@@condition_destroy_action[self.to_s.to_sym]) ? @@condition_destroy_action[self.to_s.to_sym] : nil
+  end
 
   def self.view_action
     if @@view_action[self.to_s.to_sym] == false
@@ -45,6 +56,10 @@ class RaroCrud
       return true
     end
   end
+  
+  def self.condition_view_action
+    (@@condition_view_action[self.to_s.to_sym]) ? @@condition_view_action[self.to_s.to_sym] : nil
+  end
 
   def self.root_path
     "/crud/#{self.to_s.gsub('Crud', '').underscore}"
@@ -248,15 +263,27 @@ class RaroCrud
   def self.sem_visualizacao
     @@view_action[self.to_s.to_sym] = false
   end
+  
+  def self.visualizacao(condicao)
+    @@condition_view_action[self.to_s.to_sym] = condicao
+  end
 
   def self.sem_edicao
     @@edit_action[self.to_s.to_sym] = false
   end
+  
+  def self.edicao(condicao)
+    @@condition_edit_action[self.to_s.to_sym] = condicao
+  end
 
   def self.sem_exclusao
     @@destroy_action[self.to_s.to_sym] = false
   end
   
+  def self.exclusao(condicao)
+    @@condition_destroy_action[self.to_s.to_sym] = condicao
+  end
+  
   def self.acoes(method,desc,proc = nil)
     @@actions[self.to_s.to_sym] = [] unless @@actions[self.to_s.to_sym]
     @@actions[self.to_s.to_sym].push([method,desc,proc])

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

@@ -21,12 +21,11 @@
 	<%= 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 @model.reflect_on_association(field[:attribute]).class == ActiveRecord::Reflection::BelongsToReflection and is_raro_crud(field[:attribute]) %>
+			<% if @model.reflect_on_association(field[:attribute]).class == ActiveRecord::Reflection::BelongsToReflection && is_raro_crud(@model.reflect_on_association(field[:attribute]).class_name) && field[:sf][:add_registro].nil?%>
 					<%= render_plus_button(field,f,@model,@record) %>
 			<%else%>
 					<%= render_field(field,f,@model,@record) %>
 			<%end%>
-		
 		<% end %>
 		<%@crud_helper.form_groups.each do |key, groups|%>
 			<% modelo = @model.reflect_on_association(key.to_s).class_name.constantize %>

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

@@ -52,15 +52,15 @@
 				</a>
 			<% end %>
 		<% end %>
-		<%if @crud_helper.view_action%>
+		<%if @crud_helper.view_action && shold_view?(@crud_helper, record)%>
 			<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>"
 				class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Visualizar</a>
 		<% end %>
-		<%if @crud_helper.edit_action%>
+		<%if @crud_helper.edit_action && shold_edit?(@crud_helper, record) %>
 			<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/edit"
 				class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Editar</a>
 		<% end %>
-		<%if @crud_helper.destroy_action%>
+		<%if @crud_helper.destroy_action && shold_destroy?(@crud_helper, record)%>
 			<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/destroy"
 				class="btn btn-danger btn-xs" data-push="partial" data-target="#form" data-method="delete">Excluir</a>
 		<% end %>

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

@@ -1,3 +1,4 @@
+<%unless params[:render] == 'modal'%>
 <div class="wrapper wrapper-content animated fadeInRight">
 	<div class="row">
 		<div class="col-lg-12">
@@ -10,7 +11,7 @@
 						</h5>
 					<% elsif is_action_create? && @model.present? %>
 						<h5>Cadastrar</h5>
-					<% elsif @record.present? %>
+					<% elsif @record.present? && !@record.new_record? %>
 						<h5>
 							<%= @record.to_s %>
 							<small style="margin-left: 2px;">#<%= @record.id %></small>
@@ -21,7 +22,7 @@
 							<small><%= @crud_helper.description(:index) %></small>
 						</h5>
 					<% end %>
-					<% if is_action_index? || is_action_query?%>
+					<% if (@crud_helper.present? && (is_action_index? || is_action_query?))%>
 						<div class="pull-right actions">
 							<% @crud_helper.top_links.each do |link| %>
 								<% if link[:can].present? %>
@@ -44,4 +45,7 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>
+<% else %>
+	<% block.call %>
+<% end %>

data/app/views/crud/create.js.erb

@@ -4,7 +4,7 @@
 	<%if @saved %>
 		var modal_target = "#modal_new_record." + '<%=@model.name.underscore%>';
 		$(modal_target).attr('data-saved','true')
-	  $(modal_target).attr('data-entity-name','<%=@record.to_s%>')
+	   $(modal_target).attr('data-entity-name','<%=@record.to_s%>')
 		$(modal_target).attr('data-entity-id','<%=@record.id%>')
 		$(modal_target).modal('hide')
 	<%else%>

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

@@ -23,11 +23,10 @@
 			</div>
 		</div>
 	</div>
-
-	<% if content_for? :corpo %>
-		<%= yield :corpo %>
-	<% end %>
-	<% if content_for? :modal %>
-		<%= yield  :modal %>
-	<% end %>
+<% end %>
+<% if content_for? :corpo %>
+	<%= yield :corpo %>
+<% end %>
+<% if content_for? :modal %>
+	<%= yield  :modal %>
 <% end %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

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

@@ -4,7 +4,8 @@ class Usuario < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  belongs_to :papel
+  # belongs_to :papel
+  belongs_to :perfil, :class_name => "Papel", :foreign_key => "papel_id"
   validates_presence_of :nome, :email
 
   def to_s

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

@@ -4,21 +4,22 @@ class UsuarioCrud < RaroCrud
   link_superior "Novo Usuário", id: "novo-button", icon: "plus", link: "new"
 
   ordenar_por :nome
+  edicao Proc.new {|obj| !obj.root? }
+  exclusao Proc.new {|obj| !obj.root? }
+  visualizacao Proc.new {|obj| obj.root? }
 
   campo_tabela :nome,  label: "Nome"
   campo_tabela :email, label: "email"
 
-
   campo_formulario :nome, label: "Nome"
   campo_formulario :email, label: "Email", default_test_pos: "@rarolabs.com"
   campo_formulario :password, label: "Senha", default_test: "12345678", edit: false
   campo_formulario :password_confirmation, label: "Confirmação Senha", default_test: "12345678", edit: false
-  campo_formulario :papel, label: "Papel",
-                           label_method: :descricao
+  campo_formulario :perfil, label: "Perfil", label_method: :descricao, input_html: {class: "chosen" ,   "data-placeholder" => "Escolha o perfil..."}, if: Proc.new {|obj| Usuario.current.root? }
 
   campo_visualizacao :nome,  label: "Nome"
   campo_visualizacao :email, label: "email"
-  campo_visualizacao :papel, label: "Papel"
+  campo_visualizacao :perfil, label: "Papel"
 
   campo_busca :nome,  label: "Nome"
   campo_busca :email, label: "email"

metadata

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