templus_models 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add71ac877523c9cec2b851a4aebd5149d2f58fe
-  data.tar.gz: a3bdb024c57e70654f2d6f581e9855aab43c68cb
+  metadata.gz: 62c051e04e0798ea89da0fee7b1370cba429ec2e
+  data.tar.gz: 9d9f00b6b2dde2c641c8a5c854055dc012bda477
 SHA512:
-  metadata.gz: f67c86cd4a3f4448a5b5778f29854adc55334571838c7c767c8ff16f3c3af30cce61f6713e298a221f24ff0c566219deb32c44d890669886252852939e03e253
-  data.tar.gz: 1900665598a1cc1083336a5cdbac4c532b9b0bdae9bf82da2c95044477317c8a8f2757a328164190a6795f6286671be9bba337e96df4ded0225593e814a73dba
+  metadata.gz: 3913da345f1946c39cf9fb0a6cbef44d80198afa2d97465c3960feef33195be47bc35f0f65cb282a573fe983b83eaa2d51beef5845abe3107163e778a903208d
+  data.tar.gz: 5db2a4f86ceb2bd6908300de9f236ddda97d879a7057ef68ea6508067449803b84b5f854862fc8742f172a9688c608ed5e5ca92ce4e5d19b682cd2753e8c937b

data/app/helpers/crud_helper.rb

@@ -38,6 +38,10 @@ module CrudHelper
   def is_action_show?
     params[:action] == "show"
   end
+
+  def is_action_new?
+    params[:action] == "new"
+  end
   
   
   def render_link(link)
@@ -83,33 +87,6 @@ module CrudHelper
     permissions.uniq.flatten
   end
 
-  def flash_messages_for
-    tipo = ""
-    case
-      when flash[:notice]
-        message = flash.discard(:notice)
-        tipo = 'notice'
-      when flash[:alert]
-        message = flash.discard(:alert)
-        tipo = 'alert'
-      when flash[:success]
-        message = flash.discard(:success)
-        tipo = 'success'
-      when flash[:error]
-        message = flash.discard(:error)
-        tipo = 'error'
-      when flash[:info]
-        message = flash.discard(:info)
-        tipo = 'info'
-      end
-      
-    flash.clear
-    
-    if message.present?
-      javascript_tag "mensagem_#{tipo}('#{message}')"
-    end
-  end
-
   def render_plus_button(field,f,modelo,record)
     field[:sf][:wrapper] = :with_button
     render_field(field,f,modelo,record)
@@ -166,4 +143,8 @@ module CrudHelper
 			link_to field, field.url, target: "_blank"
 		end
   end
+  
+  def render_crud(&block)
+    render "/crud/shared", block: block
+  end
 end

data/app/helpers/mensagens_helper.rb

@@ -0,0 +1,45 @@
+
+module MensagensHelper
+  def flash_messages_error(errors)
+    if errors.present?
+      render "/crud/mensagens/erros_formulario", mensagens: errors.full_messages
+    end
+  end
+
+  def flash_messages
+    message, tipo = extrair_mensagem
+    if message.present? && tipo.present?
+      render "/crud/mensagens/avisos", tipo: tipo, mensagem: menssagem
+    end
+  end
+  
+  def flash_messages_for
+    message, tipo = extrair_mensagem
+    if message.present? && tipo.present?
+      javascript_tag "mensagem_#{tipo}('#{message}')"
+    end
+  end
+  
+  private
+  def extrair_mensagem
+    case
+      when flash[:notice]
+        message = flash.discard(:notice)
+        tipo = 'warning'
+      when flash[:alert]
+        message = flash.discard(:alert)
+        tipo = 'warning'
+      when flash[:success]
+        message = flash.discard(:success)
+        tipo = 'success'
+      when flash[:error]
+        message = flash.discard(:error)
+        tipo = 'danger'
+      when flash[:info]
+        message = flash.discard(:info)
+        tipo = 'info'
+      end  
+    flash.clear
+    return message, tipo
+  end
+end

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

@@ -12,27 +12,11 @@
 		<%= render "/crud/scopes" %>
 	<% end %>
 
-
-	<% content_for :actions do %>
-		<% @crud_helper.top_links.each do |link| %>
-			<% if link[:can].present? %>
-				<%=render_link(link) if self.instance_eval &link[:can]%>
-			<% else %>
-				<%=render_link(link)%>
-			<% end %>
-		<%end%>
+	<% content_for :modal do %>
 		<% if @crud_helper.search_fields.present? %>
-			<button id="button_search_<%=@model.name.underscore%>" class="btn btn-warning btn-rounded" data-toggle="modal" data-target="#modal_search">
-				<i class="fa fa-search"></i>
-			</button>
+			<%= render "/crud/search" %>
 		<% end %>
 	<% end %>
-
-	<% content_for :modal do %>
-	<% if @crud_helper.search_fields.present? %>
-		<%= render "/crud/search" %>
-	<% end %>
-	<% end %>
 	
 <%end%>
 

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

@@ -1,70 +1,72 @@
-<div class="modal inmodal" id="modal_new_record" tabindex="-1" role="dialog" aria-hidden="true">
-	<div class="modal-dialog modal-lg">
-		<div class="modal-content animated bounceInRight">
-			<div class="modal-body">
+<%= render_crud do %>
+	<div class="modal inmodal" id="modal_new_record" tabindex="-1" role="dialog" aria-hidden="true">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content animated bounceInRight">
+				<div class="modal-body">
+				</div>
+		    <div class="modal-footer">
+		        <button type="button" class="btn btn-white" data-dismiss="modal">Cancelar</button>
+		    </div>
 			</div>
-	    <div class="modal-footer">
-	        <button type="button" class="btn btn-white" data-dismiss="modal">Cancelar</button>
-	    </div>
 		</div>
 	</div>
-</div>
 
-<%unless params[:render] == 'modal'%>
-	<% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}" %>
-	<% remote_form = false%>
-<%else%>
-	<% url = "/crud/#{@model.name.underscore}/#{@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| %>
-	<%= f.error_notification %>
-	<%@crud_helper.form_fields.each do |field|%>
-		<% if @model.reflect_on_association(field[:attribute]).class == ActiveRecord::Reflection::BelongsToReflection and is_raro_crud(field[:attribute]) %>
-				<%= render_plus_button(field,f,@model,@record) %>
-		<%else%>
-				<%= render_field(field,f,@model,@record) %>
-		<%end%>
+	<%unless params[:render] == 'modal'%>
+		<% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}" %>
+		<% remote_form = false%>
+	<%else%>
+		<% url = "/crud/#{@model.name.underscore}/#{@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| %>
+		<%= 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]) %>
+					<%= 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 %>
-		<% 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? && !@record.send(key).present?%>
-				<% @record.send("build_#{key}") %>
 		<% end %>
-		<%= f.simple_fields_for key do |g| %>
-			<div class="col-sm-12">
-				<h3 class="col-sm-2"><%= key.to_s.singularize.titleize %></h3>
-			</div>
-			<% groups.each do |field| %>
-				<%= render_field(field,g,modelo,@record) %>
+		<%@crud_helper.form_groups.each do |key, groups|%>
+			<% modelo = @model.reflect_on_association(key.to_s).class_name.constantize %>
+			<% 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? && !@record.send(key).present?%>
+					<% @record.send("build_#{key}") %>
+			<% end %>
+			<%= f.simple_fields_for key do |g| %>
+				<div class="col-sm-12">
+					<h3 class="col-sm-2"><%= key.to_s.singularize.titleize %></h3>
+				</div>
+				<% groups.each do |field| %>
+					<%= render_field(field,g,modelo,@record) %>
+				<% end %>
+				<% if [:has_many,:has_and_belongs_to_many].include?(@model.reflect_on_association(key).macro) %>
+					<div class="form-group">
+						<div class="col-sm-10 col-sm-offset-2">
+							<%= g.link_to_remove "Remover #{key.to_s.singularize}" %>
+						</div>
+					</div>
+				<% end %>
 			<% end %>
 			<% if [:has_many,:has_and_belongs_to_many].include?(@model.reflect_on_association(key).macro) %>
 				<div class="form-group">
-					<div class="col-sm-10 col-sm-offset-2">
-						<%= g.link_to_remove "Remover #{key.to_s.singularize}" %>
+					<div class="col-sm-12">
+						<%= f.link_to_add "Adicionar #{key.to_s.singularize}", key %>
 					</div>
 				</div>
 			<% end %>
 		<% end %>
-		<% if [:has_many,:has_and_belongs_to_many].include?(@model.reflect_on_association(key).macro) %>
-			<div class="form-group">
-				<div class="col-sm-12">
-					<%= f.link_to_add "Adicionar #{key.to_s.singularize}", key %>
-				</div>
+		<div class="form-group">
+			<div class="col-sm-4 col-sm-offset-2">
+				<%= f.submit "Salvar", class: 'btn btn-primary'  %>
+				<%= link_to "Voltar", "/crud/#{@model.name.underscore}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
 			</div>
-		<% end %>
-	<% end %>
-	<div class="form-group">
-		<div class="col-sm-4 col-sm-offset-2">
-			<%= f.submit "Salvar", class: 'btn btn-primary'  %>
-			<%= link_to "Voltar", "/crud/#{@model.name.underscore}" ,class: 'btn btn-default' %>
 		</div>
-	</div>
-<% end %>
-<% @crud_helper.form_scripts.each do |script| %>
-<%= javascript_include_tag "crud/#{script}" %>
+	<% end %>
+	<% @crud_helper.form_scripts.each do |script| %>
+		<%= javascript_include_tag "crud/#{script}" %>
+	<% end %>
 <% end %>
 

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

@@ -1,30 +1,31 @@
-<%= flash_messages_for %>
-<div>
-  <%= render "/crud/links" %>
-</div>
-<div class="dataTables_wrapper form-inline">
-  <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-    <thead>
-      <tr>
-        <%@crud_helper.index_fields.each do |att|  %>
-          <th>
-				 <% if att[:sort_field].present? %>
-					<%= sort_link @q, att[:sort_field], att[:label], {},data: {push: 'partial', target: "#form"}%>
-				 <% else %>
-					<%= sort_link @q, att[:attribute], att[:label], {},data: {push: 'partial', target: "#form"}%>
-				 <% end %>
-			 </th>
-        <%end%>
-	     <%if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present?%>
-	        <td>Opções</td>
-		  <% end %>
-      </tr>
-    </thead>
-    <tbody id="records-body">
-      <% @records.each do |record| %>
-        <%= render '/crud/record', record: record %>
-      <% end %>
-    </tbody>
-  </table>
-  <%= paginate @records, target: '#form'%>
-</div>
+<%= render_crud do %>
+	<div>
+		<%= render "/crud/links" %>
+	</div>
+	<div class="dataTables_wrapper form-inline">
+		<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+			<thead>
+				<tr>
+					<%@crud_helper.index_fields.each do |att|  %>
+					<th>
+						<% if att[:sort_field].present? %>
+							<%= sort_link @q, att[:sort_field], att[:label], {},data: {push: 'partial', target: "#form"}%>
+						<% else %>
+							<%= sort_link @q, att[:attribute], att[:label], {},data: {push: 'partial', target: "#form"}%>
+						<% end %>
+					</th>
+					<%end%>
+					<%if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present?%>
+						<td>Opções</td>
+					<% end %>
+				</tr>
+			</thead>
+			<tbody id="records-body">
+				<% @records.each do |record| %>
+					<%= render '/crud/record', record: record %>
+				<% end %>
+			</tbody>
+		</table>
+		<%= paginate @records, target: '#form', theme: 'templus'%>
+	</div>
+<% end %>

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

@@ -0,0 +1,51 @@
+<div class="wrapper wrapper-content animated fadeInRight">
+	<div class="row">
+		<div class="col-lg-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<% if is_action_edit? && @model.present?%>
+						<h5>
+							Editar
+							<small style="margin-left: 2px;"><%= @record.to_s %> - #<%= @record.id %></small>
+						</h5>
+					<% elsif is_action_create? && @model.present? %>
+						<h5>Cadastrar</h5>
+					<% elsif is_action_show? && @crud_helper.present? %>
+						<h5>
+							<%= @record.to_s %>
+							<small style="margin-left: 2px;">#<%= @record.id %></small>
+						</h5>
+					<% elsif @crud_helper.present? %>
+						<h5>
+							<%= @crud_helper.subtitle(:index) %>
+							<small><%= @crud_helper.description(:index) %></small>
+						</h5>
+					<% end %>
+					<% if is_action_show? %>
+					<% elsif is_action_edit? %>
+					<% elsif is_action_create? %>
+					<% elsif is_action_new? %>
+					<% else %>
+						<div class="pull-right actions">
+							<% @crud_helper.top_links.each do |link| %>
+								<% if link[:can].present? %>
+									<%=render_link(link) if self.instance_eval &link[:can]%>
+								<% else %>
+									<%=render_link(link)%>
+								<% end %>
+							<%end%>
+							<% if @crud_helper.search_fields.present? %>
+								<button id="button_search_<%=@model.name.underscore%>" class="btn btn-warning btn-rounded" data-toggle="modal" data-target="#modal_search">
+									<i class="fa fa-search"></i>
+								</button>
+							<% end %>
+						</div>
+					<% end %>
+				</div>
+				<div class="ibox-content">
+					<% block.call %>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -1,3 +1,4 @@
+<%= render_crud do %>
 <div class="widget-box">
 	<div class="widget-body">
 		<div class="widget-main">
@@ -19,21 +20,21 @@
 							<% elsif @model.reflect_on_association(field[:attribute]) &&  @model.reflect_on_association(field[:attribute]).macro != :belongs_to && @model.reflect_on_association(field[:attribute]).macro != :has_one%>
 								<td>
 									<% @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 %>
-											<% else %>
-												<% if rec.to_s.respond_to?(:url) %>
-													<%= render_field_file(rec.to_s) %>
-												<% else %>
-													<%= rec.to_s %>
-												<% end %>
-											<% end %>
-										</li>
+									<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 %>
+										<% else %>
+										<% if rec.to_s.respond_to?(:url) %>
+										<%= render_field_file(rec.to_s) %>
+										<% else %>
+										<%= rec.to_s %>
+										<% end %>
+										<% end %>
+									</li>
 									<% end %>
 								</td>
 							<% elsif @record.send(field[:attribute]).respond_to?(:url) %>
@@ -41,13 +42,13 @@
 									<%= render_field_file(@record.send(field[:attribute])) %>
 								</td>
 							<% elsif ["false","true"].include? @record.send(field[:attribute]).to_s %>
-									<td><%=  @record.send(field[:attribute]) ? "Sim" : "Não" %></td>
+								<td><%=  @record.send(field[:attribute]) ? "Sim" : "Não" %></td>
 							<% else %>
 								<td>
 									<% if field[:sf].present? && field[:sf][:label_method].present? && @record.send(field[:attribute]).present?%>
-										<%= @record.send(field[:attribute]).send(field[:sf][:label_method]) %>
+									<%= @record.send(field[:attribute]).send(field[:sf][:label_method]) %>
 									<% else %>
-										<%= @record.send(field[:attribute]) %>
+									<%= @record.send(field[:attribute]) %>
 									<% end %>
 								</td>
 							<% end %>
@@ -57,4 +58,7 @@
 			</table>
 		</div>
 	</div>
-</div>
+</div>
+<hr>
+<%= link_to "Voltar", "/crud/#{@model.name.underscore}" ,class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+<% end %>

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

@@ -1,7 +1,7 @@
 <% content_for :corpo do %>
-  <div id="form" >
-    <%= render '/crud/records' %>
-  </div>
+	<div id="form" >
+		<%= render '/crud/records' %>
+	</div>
 <% end %>
 
 <%= render "/crud/crud_template" %>

data/app/views/crud/mensagens/_avisos.html.erb

@@ -0,0 +1,4 @@
+<div class='alert alert-<%= tipo %> alert-dismissable'>"
+	<button aria-hidden='true' data-dismiss='alert' class='close' type='button'>×</button>"
+	<%= message %>
+</div>

data/app/views/crud/mensagens/_erros_formulario.html.erb

@@ -0,0 +1,18 @@
+<div class='alert alert-danger alert-dismissable' id='accordion'>
+	<button aria-hidden='true' data-dismiss='alert' class='close' type='button'>×</button>
+	<div>
+		Foram encontrados alguns erros. 
+		<a data-toggle='collapse' data-parent='#accordion' href='#collapseOne' style='color: #a94442'>
+			<b><u>Veja mais</u></b>
+		</a>
+	</div>
+	<div id='collapseOne' class='panel-collapse collapse'>
+		<ul>
+			<% mensagens.each do |mensagem| %>
+			<li>
+				<%= mensagem %>
+			</li>
+			<% end %>
+		</ul>
+	</div>
+</div>

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

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, {:remote => remote,  data: {push: 'partial', target: (!local_assigns[:target].nil? and  target) ? target : '.wiselinks-partial'}} %>
+</li>

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

@@ -0,0 +1,3 @@
+<li class="disabled">
+  <%= link_to raw(t 'views.pagination.truncate'), '#' %>
+</li>

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

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote, data: {push: 'partial', target: (!local_assigns[:target].nil? and  target) ? target : '.wiselinks-partial'}}  %>
+</li>

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

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, {:rel => 'next', :remote => remote, data:  {push: 'partial', target: (!local_assigns[:target].nil? and  target) ? target : '.wiselinks-partial'}} %>
+</li>

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

@@ -0,0 +1,3 @@
+<li class="<%= 'active' if page.current? %>">
+  <%= link_to page, page.current? ? '' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil, data:  {push: 'partial', target: (!local_assigns[:target].nil? and  target) ? target : '.wiselinks-partial'}} %>
+</li>

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

@@ -0,0 +1,36 @@
+<%= paginator.render do -%>
+	<div class="row">
+		<div class="col-xs-6">
+			<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-6">
+			<div class="dataTables_paginate paging_simple_numbers">
+				<ul class="pagination">
+					<%= first_page_tag unless current_page.first? %>
+					<%= prev_page_tag unless current_page.first? %>
+					<% each_page do |page| -%>
+						<% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+							<%= page_tag page %>
+						<% elsif !page.was_truncated? -%>
+							<%= gap_tag %>
+						<% end -%>
+					<% end -%>
+					<%= next_page_tag unless current_page.last? %>
+					<%= last_page_tag unless current_page.last? %>
+				</ul>
+			</div>
+		</div>
+	</div>
+<% end -%>

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

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, {:rel => 'prev', :remote => remote, data:  {push: 'partial', target: (!local_assigns[:target].nil? and  target) ? target : '.wiselinks-partial'}} %>
+</li>

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

@@ -11,7 +11,7 @@
 					<a href="/">Home</a>
 				</li>
 				<% if content_for? :breadcumb %>
-				<%= yield  :breadcumb %>
+					<%= yield  :breadcumb %>
 				<% end %>
 			</ol>
 		</div>
@@ -24,50 +24,10 @@
 		</div>
 	</div>
 
-<div class="wrapper wrapper-content animated fadeInRight">
-	<div class="row">
-		<div class="col-lg-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<% unless content_for? :title %>
-						<% if is_action_edit? && @model.present?%>
-							<h5>Editar</h5>
-						<% elsif is_action_create? && @model.present? %>
-							<h5>Cadastrar</h5>
-						<% elsif is_action_show? && @crud_helper.present? %>
-							<h5><%= @crud_helper.subtitle(:show) %>
-								<small><%= @crud_helper.description(:show) %></small>
-							</h5>
-						<% elsif @crud_helper.present? %>
-							<h5><%= @crud_helper.subtitle(:index) %>
-								<small><%= @crud_helper.description(:index) %></small>
-							</h5>
-						<% end %>
-					<% else %>
-						<%= yield :title %>
-					<% end %>
-					<div class="pull-right actions">
-						<% if content_for? :actions %>
-							<%= yield :actions %>
-						<% end %>
-					</div>
-				</div>
-				<div class="ibox-content">
-<%end%>
-			
-					<% if content_for? :corpo %>
-						<%= yield  :corpo %>
-					<% end %>
-<%unless params[:render] == 'modal'%>		
-
-					
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<% if content_for? :modal %>
-	<%= yield  :modal %>
+	<% if content_for? :corpo %>
+		<%= yield :corpo %>
+	<% end %>
+	<% if content_for? :modal %>
+		<%= yield  :modal %>
+	<% end %>
 <% end %>
-
-<%end%>					

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

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

@@ -2,6 +2,7 @@ class Endereco < ActiveRecord::Base
   belongs_to :cidade
   delegate :estado, to: :cidade, allow_nil: true
   belongs_to :usuario, :class_name => "Usuario", :foreign_key => "usuario_id"
+  validates_presence_of :logradouro, :numero, :cep, :bairro
   def to_s
     if logradouro.present?
       "#{logradouro}, #{numero} #{complemento}, #{bairro}, #{cidade.try(:cidade_estado)}"

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

@@ -3,6 +3,7 @@ class Teste < ActiveRecord::Base
   scope :raro, -> {where("nome like '%raro%'")}
   scope :nao_raro, -> {where("nome not like '%raro%'")}
   accepts_nested_attributes_for :teste1, allow_destroy: true
+  validates_presence_of :nome
   def to_s
     nome
   end