templus_models 1.5.15 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e7f45b44a2a79d03a0e61eb6fd5ecf7c762169
-  data.tar.gz: dc30934e74dde8a2d842ea33cd364330c5f1b2f6
+  metadata.gz: b887141343645d9ac164c5fec736112a4f68a3fe
+  data.tar.gz: 91c089d619d572a2998de38c8781a3bd8ebbe16f
 SHA512:
-  metadata.gz: b3b0d3421f6f72e7f7bf5e56d3bce508a4d51e27d24d27576a240e1c05b544c5e99344059a794ff2928142fbf9e8fb30de7969e010214f75f6c0da9aec64beb7
-  data.tar.gz: 4f3685bb1172cd51d0b08e2720f265356f81070f3aa97dc251b76abe9321fd73aca80175c71e919d93c4eb2ee7a207ad53df54a46fb506c61d1d5879166374bf
+  metadata.gz: dd0503928ce0f12f1a16ad7a66d01267576a1ac69e0aabacd5ac97fbf82d0c27fd5fbf61355ab09bb365b01dcefe199f926aabcefe035557bcfbf921b568d8af
+  data.tar.gz: a58b677b0f78b05ae83b6b87fd5a955d9897011910963d2243967d7fa682fe5118f917b99f1ec735a6df401f9f76f7a26159e0dd1bb494289138453cdf3d9dc3

data/app/assets/javascripts/link_to.js.erb

@@ -0,0 +1,12 @@
+// *.js.erb
+var link_to = function(url, params) {
+	if(!!params){
+		var _params = [];
+		for(i in params) {
+			_params.push(i + '=' + params[i]);
+		}
+		return "<%= ENV['RAILS_RELATIVE_URL_ROOT']%>" + url + "?" + _params.join('&');
+	}else{
+		return "<%= ENV['RAILS_RELATIVE_URL_ROOT']%>" + url;
+	}
+};

data/app/assets/javascripts/raro_crud.js

@@ -8,8 +8,7 @@ function new_record(id,name,model_name){
 
 	var model_target = "#modal_new_record." + model_name;
 	
-	
-	var url = "/crud/" + class_name + "/new.js?render=modal&attribute="+ model_name;
+	var url = link_to("/crud/" + class_name + "/new.js", {"render": "modal", "attribute": model_name});
 	var jqxhr = $.ajax(url)
 	.done(function(result) {
 		$(model_target).attr('data-source',id);

data/app/controllers/crud_controller.rb

@@ -1,6 +1,6 @@
 class CrudController < ApplicationController
   before_filter :setup, except: :autocomplete
-  
+
   private
   def setup
     if params[:associacao]
@@ -8,18 +8,20 @@ class CrudController < ApplicationController
       @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
       c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
       @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
+      @url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao], page: params[:page], q: params[:q])
+      @url_str = "/crud/#{params[:model]}/#{params[:id]}/#{params[:associacao]}/"
       @model_permission = c_helper.constantize
-      @url = "/crud/#{params[:model]}/#{params[:id]}/#{params[:associacao]}"
       @id = params[:associacao_id] if params[:associacao_id]
     else
       @model = Module.const_get(params[:model].camelize)
       @model_permission = @model
       @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
-      @url = "/crud/#{params[:model]}"
+      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
+      @url_str = "/crud/#{params[:model]}/"
       @id = params[:id] if params[:id]
     end
   end
-  
+
   public
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
@@ -43,7 +45,7 @@ class CrudController < ApplicationController
     @titulo = @model.name.pluralize
     render partial: 'records' if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
   end
-  
+
   def new
     if params[:render] == "modal"
       if @model.reflect_on_association(params[:attribute].to_s).present?
@@ -51,14 +53,14 @@ class CrudController < ApplicationController
       else
         @model = params[:attribute].to_s.camelcase.constantize
       end
+      @url = crud_models_path(model: @model.name.underscore)
       @model_permission = @model
-      @url = "/crud/#{@model.name.underscore}"
       @crud_helper = Module.const_get("#{@model}Crud".camelize)
     end
     authorize! :new, @model_permission if respond_to?(:current_usuario)
     @record = @model.new
   end
-  
+
   def edit
     @record = @model.find(@id)
     authorize! :edit, @record if respond_to?(:current_usuario)
@@ -85,7 +87,7 @@ class CrudController < ApplicationController
       render partial: "/#{@model.name.underscore.pluralize}/#{params[:acao]}" if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
     end
   end
-  
+
   def create
     @saved = false
     if @id
@@ -97,11 +99,11 @@ class CrudController < ApplicationController
       authorize! :create, @model_permission if respond_to?(:current_usuario)
       @saved = @record.save
     end
-    
+
     respond_to do |format|
       if @saved
         flash[:success] = params[:id].present? ? "Cadastro alterado com sucesso." : "Cadastro efetuado com sucesso."
-        format.html { redirect_to "#{@url}?page=#{params[:page]}" }
+        format.html { redirect_to @url }
         unless params[:render] == 'modal'
           format.js { render action: :index}
         else
@@ -114,7 +116,7 @@ class CrudController < ApplicationController
       end
     end
   end
-  
+
   def destroy
     @record = @model.find(@id)
     authorize! :destroy, @record if respond_to?(:current_usuario)
@@ -132,7 +134,7 @@ class CrudController < ApplicationController
       end
     end
   end
-  
+
   def query
     authorize! :read, @model_permission if respond_to?(:current_usuario)
     @resource = @model
@@ -150,7 +152,7 @@ class CrudController < ApplicationController
       render :index, controller: request[:controller]
     end
   end
-  
+
   def autocomplete
     @model = Module.const_get(params[:model].camelize)
     authorize! :read, @model if respond_to?(:current_usuario)
@@ -168,10 +170,10 @@ class CrudController < ApplicationController
   end
 
   private
-  def params_permitt 
+  def params_permitt
     params.require(@model.name.underscore.to_sym).permit(fields_model)
   end
-  
+
   def fields_model
     fields = []
     @crud_helper.form_fields.each do |field|
@@ -201,7 +203,7 @@ class CrudController < ApplicationController
     end
     fields
   end
-  
+
   def permitt_group(fields, key, groups,mod)
     chave = "#{key}_attributes"
     group = {chave => [:id, :_destroy]}
@@ -219,8 +221,8 @@ class CrudController < ApplicationController
         elsif (modelo.columns_hash[field[:attribute].to_s] || (modelo.respond_to?(:params_permitt) && modelo.params_permitt.include?(field[:attribute].to_sym)))
           group[chave] << field[:attribute]
         end
-       end
+      end
     end
     group
   end
-end
+end

data/app/helpers/crud_helper.rb

@@ -1,5 +1,5 @@
 module CrudHelper
-  
+
   def is_active_controller(controller_name)
       params[:controller] == controller_name ? "active" : nil
   end
@@ -7,7 +7,7 @@ module CrudHelper
   def is_active_action(action_name)
       params[:action] == action_name ? "active" : nil
   end
-  
+
   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
@@ -16,7 +16,7 @@ module CrudHelper
     #end
     return @@cruds.include?(classe.underscore.to_s)
   end
-  
+
   def lista_menus_crud(raro_models)
     menus = []
     raro_models.each do |modelo|
@@ -24,7 +24,7 @@ module CrudHelper
     end
     menus
   end
-  
+
   def menu_helper_crud(modelo, url, nome, classe, icon='')
     if can?(:read, classe)
       buffer = ""
@@ -58,8 +58,8 @@ module CrudHelper
   def is_action_query?
     params[:action] == "query"
   end
-  
-  
+
+
   def render_link(link,url)
     if link[:partial].present?
       render link[:partial]
@@ -72,7 +72,7 @@ module CrudHelper
 
   def gen_icon(i)
     if i
-      "<i class='#{i}'></i>" 
+      "<i class='#{i}'></i>"
     else
       ""
     end
@@ -94,7 +94,7 @@ module CrudHelper
     end
     models.uniq.flatten
   end
-  
+
   def raro_permissions
     permissions = []
     Dir["#{Rails.root.to_s}/app/controllers/*"].each do |f|
@@ -113,7 +113,7 @@ module CrudHelper
     field[:sf][:wrapper] = :with_button
     render_field(field,f,modelo,record)
   end
-    
+
   def render_field(field,f,modelo,record)
     field[:sf][:wrapper] ||= :default
     if field[:sf].present? && field[:sf][:if].present?
@@ -125,22 +125,22 @@ module CrudHelper
     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 
+      elsif !field[:sf][:create].nil? && !field[:sf][:create] && record.new_record?
+      else
         unless modelo.reflect_on_association(field[:attribute])
           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 
+        else
            f.association field[:attribute], field[:sf]
-        end 
-      end 
+        end
+      end
     else
       if field[:sf][:value] and field[:sf][:value].class == Proc
-         field[:sf][:input_html] ||= {} 
-         field[:sf][:input_html][:value] = f.instance_eval &field[:sf][:value] 
+         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
          field[:sf][:collection] = f.instance_eval &field[:sf][:collection_if]
@@ -151,24 +151,24 @@ module CrudHelper
         else
           f.input field[:attribute], field[:sf]
         end
-      else 
+      else
         f.association field[:attribute], field[:sf]
-      end 
+      end
     end
   end
-  
+
   def imagem?(file)
     file.present? && file.content_type.start_with?('image')
   end
 
   def video?(file)
     file.present? && file.content_type.start_with?('video')
-  end  
-  
+  end
+
   def documento?(file)
     !(video?(file) || imagem?(file))
   end
-  
+
   def render_field_file(field)
 		if imagem?(field) && field.url(:thumb)
 			image_tag(field.url(:thumb))
@@ -178,31 +178,31 @@ module CrudHelper
 			link_to field, field.url, target: "_blank"
 		end
   end
-  
+
   def render_crud(&block)
     render "/crud/shared", block: block
   end
-  
+
   def render_default_actions_crud
     render "default_actions_crud"
   end
-  
+
   #Permissions
-  def shold_view?(crud_helper,record)
+  def should_view?(crud_helper,record)
     return false unless can?(:read, record)
     return true if crud_helper.condition_view_action.nil?
     crud_helper.condition_view_action.call(record)
   end
 
-  def shold_edit?(crud_helper,record)
+  def should_edit?(crud_helper,record)
     return false unless can?(:update, record)
     return true if crud_helper.condition_edit_action.nil?
     crud_helper.condition_edit_action.call(record)
   end
 
-  def shold_destroy?(crud_helper,record)
+  def should_destroy?(crud_helper,record)
     return false unless can?(:destroy, record)
     return true if crud_helper.condition_destroy_action.nil?
     crud_helper.condition_destroy_action.call(record)
   end
-end
+end

data/app/raro_crud/raro_crud.rb

@@ -72,7 +72,7 @@ class RaroCrud
   end
 
   def self.root_path
-    "/crud/#{self.to_s.gsub('Crud', '').underscore}"
+    self.to_s.gsub('Crud', '').underscore
   end
 
   def self.index_path str
@@ -238,7 +238,7 @@ class RaroCrud
     if opts.present? && opts[:autocomplete].present?
       opts[:as] = :autocomplete
       label_method = opts[:autocomplete][:label_method] || opts[:autocomplete][:campo]
-      opts[:url] = "/crud/#{opts[:autocomplete][:classe]}/autocomplete?campo=#{opts[:autocomplete][:campo]}&tipo=start&label=#{label_method}"
+      opts[:url] = autocomplete_crud_path(model: opts[:autocomplete][:classe], campo: opts[:autocomplete][:campo], tipo: "start", label: label_method)
       name = "#{opts[:autocomplete][:campo]}_#{opts[:autocomplete][:classe]}"
       opts[:input_html] = {name: name, id: name}
       opts[:id_element] = "##{self.modelo}_#{nome}_id"

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

@@ -3,7 +3,7 @@
 		<% if @crud_associacao.present? %>
 		<li class=""><%= link_to @crud_associacao.title, @crud_associacao.root_path %></li>
 		<% end %>
-		<li class=""><%= link_to @crud_helper.title, @crud_helper.root_path %></li>
+		<li class=""><%= link_to @crud_helper.title, crud_models_path(model: @crud_helper.root_path) %></li>
 	<% end %>
 		
 

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

@@ -1,2 +1,2 @@
 <%= submit_tag("Salvar", class: "btn btn-primary") %>
-<%= link_to "Voltar", @url, class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+<%= link_to "Voltar", @url, class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>

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

@@ -11,10 +11,22 @@
 		</div>
 	</div>
 	<%unless params[:render] == 'modal'%>
-		<% url = "#{@url}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}?page=#{params[:page]}" %>
+		<% if @record.new_record? %>
+			<% if @crud_associacao.present? %>
+				<% url = create_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], page: params[:page], q: params[:q]) %>
+			<% else %>
+				<% url = create_crud_path(model: @model.name.underscore, page: params[:page], q: params[:q]) %>
+			<% end %>
+		<% else %>
+			<% if @crud_associacao.present? %>
+				<% url = update_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]) %>
+			<% else %>
+				<% url = update_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]) %>
+			<% end %>
+		<% end %>
 		<% remote_form = false%>
 	<%else%>
-		<% url = "#{@url}/#{@record.new_record? ? 'create?render=modal' : @record.id.to_s+'/create?render=modal'}" %>
+		<% url = "#{@url_str}/#{@record.new_record? ? 'create?render=modal' : @record.id.to_s+'/create?render=modal'}" %>
 		<% remote_form = true%>
 	<%end%>
 	<%= simple_nested_form_for @record, remote: remote_form, html: {class: "form-horizontal"}, url: url do |f| %>
@@ -40,7 +52,7 @@
 			<div class="col-sm-4 col-sm-offset-2">
 				<%= f.submit "Salvar", class: 'btn btn-primary'  %>
 				<%unless params[:render] == 'modal'%>
-					<%= link_to "Voltar", "#{@url}?page=#{params[:page]}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+					<%= link_to "Voltar", @url, class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
 				<% end %>
 			</div>
 		</div>

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

@@ -29,12 +29,12 @@
 					<% end %>
 				</td>
 			<% elsif record.send(att[:attribute]).respond_to?(:url) and record.send(att[:attribute]).url(:thumb) %>
-				<td><%=  image_tag(record.send(att[:attribute]).url(:thumb)) %></td> 
+				<td><%=  image_tag(record.send(att[:attribute]).url(:thumb)) %></td>
 			<% else %>
 				<% if record.send(att[:attribute]).to_s == "false" or record.send(att[:attribute]).to_s == "true" %>
-					<td><%=  record.send(att[:attribute]) ? "Sim" : "Não" %></td>  
+					<td><%=  record.send(att[:attribute]) ? "Sim" : "Não" %></td>
 				<% else %>
-					<td><%=  record.send(att[:attribute]).to_s %></td>  
+					<td><%=  record.send(att[:attribute]).to_s %></td>
 				<% end %>
 			<% end %>
 		<% else %>
@@ -44,8 +44,7 @@
 	<td>
 		<%@crud_helper.actions.each do |a|%>
 			<% if ((a[2].present? && a[2].call(record)) || !a[2].present?) %>
-				<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/acao/<%=a[0]%>"
-						class="btn btn-primary btn-xs" data-push="partial" data-target="#form"><%=a[1]%></a>
+				<%= link_to a[1], action_crud_path(model: @model.name.underscore, id: record.id, acao: a[0], page: params[:page], q: params[:q]), class: "btn btn-primary btn-xs", data: {push: "partial", target: "#form"}%>
 			<% end %>
 		<% end %>
 		<%@crud_helper.actions_links.each do |name, options|%>
@@ -64,24 +63,31 @@
 					</a>
 				<% end %>
 			<% elsif options[:associacao].present? %>
-				<a href="/crud/<%= @model.name.underscore %>/<%= record.id %>/<%= options[:associacao].to_s %>" class="btn btn-success btn-xs">
-					<%=name%>
-				</a>
+				<%= link_to name, crud_associacao_models_path(model: @model.name.underscore, id: record.id, associacao: options[:associacao].to_s), class: "btn btn-success btn-xs", data: {push: "partial", target: "#form"} %>
 			<% elsif options[:partial].present? %>
 				<%= render options[:partial], record: record %>
 			<% end %>
 		<% end %>
-		<%if @crud_helper.view_action && shold_view?(@crud_helper, record)%>
-			<a href="<%= @url %>/<%=record.id%>?page=<%=params[:page]%>"
-				class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Visualizar</a>
+		<%if @crud_helper.view_action && should_view?(@crud_helper, record)%>
+			<% if @crud_associacao.present? %>
+				<%= link_to "Visualizar", crud_associacao_model_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+			<% else %>
+				<%= link_to "Visualizar", crud_model_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+			<% end %>
 		<% end %>
-		<%if @crud_helper.edit_action && shold_edit?(@crud_helper, record) %>
-			<a href="<%= @url %>/<%=record.id%>/edit?page=<%=params[:page]%>"
-				class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Editar</a>
+		<%if @crud_helper.edit_action && should_edit?(@crud_helper, record) %>
+			<% if @crud_associacao.present? %>
+				<%= link_to "Editar", edit_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+			<% else %>
+				<%= link_to "Editar", edit_crud_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+			<% end %>
 		<% end %>
-		<%if @crud_helper.destroy_action && shold_destroy?(@crud_helper, record)%>
-			<a href="<%= @url %>/<%=record.id%>/destroy"
-				class="btn btn-danger btn-xs" data-method="delete" data-confirm="Você têm certeza?">Excluir</a>
+		<%if @crud_helper.destroy_action && should_destroy?(@crud_helper, record)%>
+			<% if @crud_associacao.present? %>
+				<%= link_to "Excluir", destroy_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs', data: {method: 'delete', confirm: 'Você tem certeza?'} %>
+			<% else %>
+				<%= link_to "Excluir", destroy_crud_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs', data: {method: 'delete', confirm: 'Você tem certeza?'} %>
+			<% end %>
 		<% end %>
-	</td>  
+	</td>
 <% end %>

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

@@ -1,8 +1,8 @@
 <% if @crud_helper.layout[1].present? and @crud_helper.layout[1].call() and @crud_helper.layout[0] == "escopo_lateral" %>
 	<% if @crud_helper.scopes.present? %>
 		<div class="col-lg-3" style="padding-right:0;">
-    	<div class="ibox float-e-margins" style="padding-top:40px">
-      	<div class="ibox-content">
+			<div class="ibox float-e-margins" style="padding-top:40px">
+				<div class="ibox-content">
 					<div class="file-manager">
 						<%= render '/crud/scopes' %>
 					</div>
@@ -11,7 +11,7 @@
 		</div>
 	<% end %>
 <% end %>
-<div class="col-lg-<%= @crud_helper.layout[1].present? and @crud_helper.layout[1].call() and @crud_helper.layout[0] == "escopo_lateral" and @crud_helper.scopes.present? ? 9 : 12 %>" style="padding-left:0;">
+<div class="col-lg-<%= @crud_helper.layout[1].present? && @crud_helper.layout[1].call() && @crud_helper.layout[0] == 'escopo_lateral' && @crud_helper.scopes.present? ? 9 : 12 %>" style="padding-left:0;">
 	<%= render_crud do %>
 		<div>
 			<%= render "/crud/links" %>
@@ -48,4 +48,4 @@
 			<%= paginate @records, target: '#form', theme: 'templus'%>
 		</div>
 	<% end %>
-</div>
+</div>

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

@@ -1,7 +1,7 @@
 <% if @crud_helper.scopes.present? %>
 	<% if @crud_helper.scopes.class == Array %>
 		<% @crud_helper.scopes.each do |escopo| %>
-			<%= link_to "#{@url}?scope=#{escopo[0]}", id: "#{escopo[0]}", data: {push: true, crumb: 'wielka'} do%>
+			<%= link_to crud_models_path(model: @model.name.underscore, scope: escopo[0]), id: "#{escopo[0]}", data: {push: true, crumb: 'wielka'} do%>
 				<div style="float: left; margin-left: 10px; min-width: 100px; position:relative;">
 					<div class="widget style1 gray-bg" style="padding:15px 0px!important;">
 						<div class="row vertical-align text-center" style="margin:0!important;">
@@ -23,4 +23,4 @@
 	<% else %>
 		<%= render @crud_helper.scopes %>
 	<% end %>
-<% end %>
+<% end %>

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

@@ -8,7 +8,12 @@
 				<small class="font-bold"></small>
 			</div>
 			<div class="modal-body">
-				<%=raro_search_form(@model, 'records','records',"#{@url}/query") do%>
+				<% if @crud_associacao.present? %>
+					<% url = query_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao]) %>
+				<% else %>
+					<% url = query_crud_path(model: @model.name.underscore) %>
+				<% end %>
+				<%=raro_search_form(@model, 'records','records', url) do%>
 					<%raro_group "#{@crud_helper.title}"%>
 					<%@crud_helper.search_fields.each do |att| %>
 						<% if att[:sf].present? && !att[:sf][:visible_if].nil?%>
@@ -22,4 +27,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>

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

@@ -26,9 +26,9 @@
 						<div class="pull-right actions">
 							<% @crud_helper.top_links.each do |link| %>
 								<% if link[:can].present? %>
-									<%=render_link(link,@url) if self.instance_eval &link[:can]%>
+									<%=render_link(link,@url_str) if self.instance_eval &link[:can]%>
 								<% else %>
-									<%=render_link(link,@url)%>
+									<%=render_link(link,@url_str)%>
 								<% end %>
 							<%end%>
 							<% if @crud_helper.search_fields.present? %>
@@ -37,6 +37,21 @@
 								</button>
 							<% end %>
 						</div>
+					<% elsif is_action_show? %>
+						<% if (@crud_helper.present? && @crud_helper.destroy_action) && should_destroy?(@crud_helper, @record) %>
+							<% if @crud_associacao.present? %>
+								<%= link_to "Excluir", destroy_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs pull-right m-l-xs', data: {method: 'delete', confirm: 'Você tem certeza?'} %>
+							<% else %>
+								<%= link_to "Excluir", destroy_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs pull-right m-l-xs', data: {method: 'delete', confirm: 'Você tem certeza?'} %>
+							<% end %>
+						<% end %>
+						<% if (@crud_helper.present? && @crud_helper.edit_action) && should_edit?(@crud_helper, @record) %>
+							<% if @crud_associacao.present? %>
+								<%= link_to "Editar", edit_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs pull-right m-l-xs', data: {push: 'partial', target: '#form'} %>
+							<% else %>
+								<%= link_to "Editar", edit_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs pull-right m-l-xs', data: {push: 'partial', target: '#form'} %>
+							<% end %>
+						<% end %>
 					<% end %>
 				</div>
 				<div class="ibox-content">
@@ -48,4 +63,4 @@
 </div>
 <% else %>
 	<% block.call %>
-<% end %>
+<% end %>

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

@@ -73,5 +73,5 @@
 	</div>
 </div>
 <hr>
-<%= link_to "Voltar", "#{@url}" ,class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
-<% end %>
+<%= link_to "Voltar", @url ,class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+<% end %>

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

@@ -1,6 +1,12 @@
 <% content_for :corpo do %>
 	<div id="form" >
-		<%= render '/crud/records' %>
+		<% if @crud_helper.layout[1].present? and @crud_helper.layout[1].call() and @crud_helper.layout[0] == "escopo_lateral" %>
+			<div class="row">
+				<%= render '/crud/records' %>
+			</div>
+		<% else %>
+			<%= render '/crud/records' %>
+		<% end %>
 	</div>
 <% end %>
 

data/app/views/kaminari/templus/_paginator.html.erb

@@ -1,6 +1,21 @@
 <%= paginator.render do -%>
 	<div class="row">
-		<div class="col-xs-12">
+		<div class="col-xs-4">
+			<div class="pagination pull-left">
+				<% if @options[:current_page].number < 2 %>
+					<% inicio = 1 %>
+				<% else %>
+					<% inicio = ((@options[:current_page].number - 1) * @options[:per_page]) + 1 %>
+				<% end %>
+				<% if @options[:current_page].last? %>
+					<% fim = @options[:total_count] %>
+				<% else %>
+					<% fim = @options[:current_page].number * @options[:per_page] %>
+				<% end %>
+				Exibindo <%= inicio %> - <%= fim %> de um total de <%= @options[:total_count] %>
+			</div>
+		</div>
+		<div class="col-xs-8">
 			<div class="dataTables_paginate paging_simple_numbers">
 				<ul class="pagination">
 					<%= first_page_tag unless current_page.first? %>

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

@@ -8,7 +8,9 @@
 			</h2>
 			<ol class="breadcrumb">
 				<li>
-					<a href="/">Home</a>
+					<%= link_to root_path do %>
+						Home
+					<% end %>
 				</li>
 				<% if content_for? :breadcumb %>
 					<%= yield  :breadcumb %>

data/config/routes.rb

@@ -1,25 +1,25 @@
 Rails.application.routes.draw do
   # Routes for RaroCrud
-  get '/crud/:model' => "crud#index"
-  get '/crud/:model/:id/edit' => "crud#edit"
-  delete '/crud/:model/:id/destroy' => "crud#destroy"
-  get '/crud/:model/new' => "crud#new"
-  get '/crud/:model/query' => "crud#query"
-  get '/crud/:model/autocomplete' => "crud#autocomplete"
-  post '/crud/:model/create' => "crud#create"
-  patch '/crud/:model/:id/create' => "crud#create"
-  get '/crud/:model/:id/acao/:acao' => "crud#action"
-  get '/crud/:model/:id' => "crud#show"
+  get '/crud/:model' => "crud#index", as: :crud_models
+  get '/crud/:model/:id/edit' => "crud#edit", as: :edit_crud
+  delete '/crud/:model/:id/destroy' => "crud#destroy", as: :destroy_crud
+  get '/crud/:model/new' => "crud#new", as: :new_crud
+  get '/crud/:model/query' => "crud#query", as: :query_crud
+  get '/crud/:model/autocomplete' => "crud#autocomplete", as: :autocomplete_crud
+  post '/crud/:model/create' => "crud#create", as: :create_crud
+  patch '/crud/:model/:id/create' => "crud#create", as: :update_crud
+  get '/crud/:model/:id/acao/:acao' => "crud#action", as: :action_crud
+  get '/crud/:model/:id' => "crud#show", as: :crud_model
 
   #Routes for RaroCrud Associations
-  get '/crud/:model/:id/:associacao' => "crud#index"
-  get '/crud/:model/:id/:associacao/:associacao_id/edit' => "crud#edit"
-  delete '/crud/:model/:id/:associacao/:associacao_id/destroy' => "crud#destroy"
-  get '/crud/:model/:id/:associacao/new' => "crud#new"
-  get '/crud/:model/:id/:associacao/query' => "crud#query"
-  get '/crud/:model/:id/:associacao/autocomplete' => "crud#autocomplete"
-  post '/crud/:model/:id/:associacao/create' => "crud#create"
-  patch '/crud/:model/:id/:associacao/:associacao_id/create' => "crud#create"
-  get '/crud/:model/:id/:associacao/:associacao_id/acao/:acao' => "crud#action"
-  get '/crud/:model/:id/:associacao/:associacao_id' => "crud#show"
+  get '/crud/:model/:id/:associacao' => "crud#index", as: :crud_associacao_models
+  get '/crud/:model/:id/:associacao/:associacao_id/edit' => "crud#edit", as: :edit_crud_associacao
+  delete '/crud/:model/:id/:associacao/:associacao_id/destroy' => "crud#destroy", as: :destroy_crud_associacao
+  get '/crud/:model/:id/:associacao/new' => "crud#new", as: :new_crud_associacao
+  get '/crud/:model/:id/:associacao/query' => "crud#query", as: :query_crud_associacao
+  get '/crud/:model/:id/:associacao/autocomplete' => "crud#autocomplete", as: :autocomplete_crud_associacao
+  post '/crud/:model/:id/:associacao/create' => "crud#create", as: :create_crud_associacao
+  patch '/crud/:model/:id/:associacao/:associacao_id/create' => "crud#create", as: :update_crud_associacao
+  get '/crud/:model/:id/:associacao/:associacao_id/acao/:acao' => "crud#action", as: :action_crud_associacao
+  get '/crud/:model/:id/:associacao/:associacao_id' => "crud#show", as: :crud_associacao_model
 end

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.5.15"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.6.0
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,6 +133,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
+- app/assets/javascripts/link_to.js.erb
 - app/assets/javascripts/raro_crud.js
 - app/assets/javascripts/templus_models.js.coffee
 - app/controllers/crud_controller.rb