templus_models 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfad85131bd19efb453328996e69385d9e4c9342
-  data.tar.gz: c8d4b46fddeda767f28b832c3ca9bd460a0aa74d
+  metadata.gz: 845ed602a56f3be89f09e342b94271ab7afc03b8
+  data.tar.gz: bfa20f896c77a17e5a47d01c59427d96240933b2
 SHA512:
-  metadata.gz: 603316b3e62cc51bda580620a885b7731056106c9a7902735f5d0c6d7b6295b41d6cef997e200f49a37a2e7679fdd0bb7f24578efa61f6e7be1120395bd8a9aa
-  data.tar.gz: 483f928f955f6803c94c099bb0e70148848b9ebde9a18da9b2fcc68eb8abeb1773e392fb18e82b29731354e146b13747eda17428c6c2cb7ec8507ceff6df48e7
+  metadata.gz: aa2e7956fa605a9edc246d53bed6b4ed539b0c4ded42b1b9a011f4c6db3eb6f164189112cf45cb2b7eb76a426c3e42c85e0fda279c5dd203fb4292833f343de1
+  data.tar.gz: 08ee0caac1acf183ff72da72d5bbec6ca8c87f572fd4cafca828177d67d47e5d93c679b0847e5b7d73df25009299528174fda57de0f8aceda039b1194ace0015

data/app/helpers/crud_helper.rb

@@ -61,7 +61,12 @@ module CrudHelper
   
   
   def render_link(link)
-    "<a href='#{link[:link]}' class='#{link[:class]}' #{data(link)}>#{gen_icon(link[:icon])} #{link[:text]}</a>".html_safe
+    if link[:partial].present?
+      render link[:partial]
+    else
+      url = link[:url] || link[:link]
+      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, url, class: link[:class], data: data(link)
+    end
   end
 
   def gen_icon(i)
@@ -73,9 +78,9 @@ module CrudHelper
   end
 
   def data(link)
-    buffer = ""
-    link[:data].each_key{|k| buffer << " data-#{k}='#{link[:data][k]}' "} if link[:data]
-    return buffer
+    data = {}
+    link[:data].each_key{|k| data[k] = link[:data][k]} if link[:data]
+    return data
   end
 
   def raro_models

data/app/raro_crud/raro_crud.rb

@@ -190,7 +190,9 @@ class RaroCrud
             icon: "fa fa-#{opts[:icon]}",
             class: 'btn btn-small btn-primary btn-rounded',
             link: "#{self.root_path}/#{opts[:link]}",
-            can: opts[:can]
+            url: opts[:url],
+            can: opts[:can],
+            partial: opts[:partial]
           }
     )
   end 

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

@@ -10,7 +10,6 @@
 			</div>
 		</div>
 	</div>
-
 	<%unless params[:render] == 'modal'%>
 		<% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}" %>
 		<% remote_form = false%>
@@ -62,7 +61,9 @@
 		<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"} %>
+				<%unless params[:render] == 'modal'%>
+					<%= link_to "Voltar", "/crud/#{@model.name.underscore}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+				<% end %>
 			</div>
 		</div>
 	<% end %>

data/lib/templus_models/version.rb

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

data/test/dummy/app/assets/javascripts/atualizacoes.js.coffee

@@ -8,12 +8,13 @@ $ ->
   #   "plugins": ["html_data"]
   #   "core" : { "initially_open" : [ "root" ] }
 
-  # $(document).off('page:loading').on(
-  #     'page:loading'
-  #     (event, $target, render, url) ->
-  #         NProgress.start()
-  #         bloqueia()
-  # )
+  $(document).off('page:loading').on(
+      'page:loading'
+      (event, $target, render, url) ->
+          $("#modal_search").remove()
+          $("#modal_new_record").remove()
+          # bloqueia()
+  )
   #
   # $(document).off('page:redirected').on(
   #     'page:redirected'

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

@@ -2,6 +2,8 @@ class UsuarioCrud < RaroCrud
   titulo "Usuários"
 
   link_superior "Novo Usuário", id: "novo-button", icon: "plus", link: "new"
+  link_superior "Inicio", id: "novo-button", icon: "", url: :busca_api_cidades
+  link_superior "Novo", partial: "/usuarios/actions"
 
   ordenar_por :nome
   edicao Proc.new {|obj| !obj.root? }

data/test/dummy/app/views/usuarios/_actions.html.erb

@@ -0,0 +1,3 @@
+<%= link_to "http://rarolabs.com.br" do %>
+	<i class="fa fa-users fa-2x"></i>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -347,6 +347,7 @@ files:
 - test/dummy/app/views/layouts/login2.html.erb
 - test/dummy/app/views/layouts/wiselinks.html.erb
 - test/dummy/app/views/papeis/_associar.html.erb
+- test/dummy/app/views/usuarios/_actions.html.erb
 - test/dummy/app/views/usuarios/_edit.html.erb
 - test/dummy/app/views/usuarios/_form.html.erb
 - test/dummy/app/views/usuarios/edit.html.erb
@@ -1119,6 +1120,7 @@ test_files:
 - test/dummy/app/views/layouts/login2.html.erb
 - test/dummy/app/views/layouts/wiselinks.html.erb
 - test/dummy/app/views/papeis/_associar.html.erb
+- test/dummy/app/views/usuarios/_actions.html.erb
 - test/dummy/app/views/usuarios/_edit.html.erb
 - test/dummy/app/views/usuarios/_form.html.erb
 - test/dummy/app/views/usuarios/edit.html.erb