templus_models 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb0cc95c5bfa019c9542e783b7f340cc2d732f0
-  data.tar.gz: 175ca61205b9b4f4588c8994538977c241af5029
+  metadata.gz: 23116f5eee2d923fe90da09e82073c3f315fc79c
+  data.tar.gz: 6cb21d0fc34da32c6f8e8b88219026e9b45454a8
 SHA512:
-  metadata.gz: f46f9241987ea445ae2fafc85872f74d3bc46a4a784e1edb73d5b757def6c2570eb2e45191a49331a70d9ae85b271d803d14e74e6fd88f26a9213b6a21d61bf9
-  data.tar.gz: 1fdb2615e5d8772e7dc1aa07f198ae8bca1c8479a96a77ed4327e839918903190a31975feb8bb73566ac829e32fe2362964e5637c977596e4800c1199583316f
+  metadata.gz: af1e04ba6846724085eb15f00ddc7ffc687fb4660413a59bda27b6bda0bd9a87a0421237e72bca17a9301d5feb6a7cdfad434f0e7b0203e80e0426b796d59c2c
+  data.tar.gz: 678efc4612f50945fbbd9c71ffa6d27920c2227ff867ec54074a9bb03aaba52f7c4c8f1600bbed46810064628e0ba84521e2c93419feb0e778dd01b0cc7eb3c9

data/app/controllers/crud_controller.rb

@@ -162,7 +162,6 @@ class CrudController < ApplicationController
       format.xls { headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls" }
       format.pdf do
         html = render_to_string('crud/listing.pdf.erb')
-        File.write('/Users/pedropires/Desktop/test.html', html)
         options = {
           encoding: 'UTF-8',
           page_size: 'A4',

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

@@ -60,24 +60,29 @@
 					<%= link_to I18n.t(a[1]), action_crud_path(model: @model.name.underscore, id: record.id, acao: a[0]), class: "btn btn-primary btn-xs", data: {push: "partial", target: "#form"}%>
 				<% end %>
 			<% end %>
-			<%@crud_helper.actions_links.each do |name, options|%>
-				<% unless (options[:can].present? && !record.instance_eval(&options[:can])) %>
+			<% @crud_helper.actions_links.each do |name, options| %>
+				<% unless options[:can].present? && !record.instance_eval(&options[:can]) %>
 					<% if options[:url].present? %>
 						<% url = options[:url] %>
+
 						<% if options[:id] %>
 							<% url += options[:url].include?("?") ? "&id=#{record.id}" : "?id=#{record.id}" %>
 						<% else url.include?(":id") %>
 							<% url = url.gsub(":id", "#{record.id}") %>
 						<% end %>
+
+						<% if options[:class] %>
+							<% link_class = 'btn btn-xs ' + options[:class] %>
+						<% else %>
+							<% link_class = 'btn btn-success btn-xs' %>
+						<% end %>
+
 						<% if options[:wiselink].present? && options[:wiselink] %>
-							<a href="<%= url %>" class="btn btn-success btn-xs" data-push="partial" data-target="#form">
-								<%=I18n.t(name)%>
-							</a>
+							<%= link_to t(name), url, class: link_class, data: { push: 'partial', target: '#form' } %>
 						<% else %>
-							<a href="<%= url %>" class="btn btn-success btn-xs">
-								<%=I18n.t(name)%>
-							</a>
+							<%= link_to t(name), url, class: link_class %>
 						<% end %>
+
 					<% elsif options[:associacao].present? %>
 						<%= 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? %>

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

@@ -6,7 +6,7 @@
     <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
       <thead>
         <tr>
-          <%@crud_helper.index_fields.each do |att|  %>
+          <% @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 %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -981,7 +981,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects