templus_models 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a32e3baae3e617d1b3d1ba52b72275de3e69f7
-  data.tar.gz: 94f286c2f34c143da3381f2eb9cb1169b826cc51
+  metadata.gz: 221017c24aa94567ccc8ca71bfb54309bbe585dd
+  data.tar.gz: 9bfa65fa03301259c1aedd8ac65b547d595fe00d
 SHA512:
-  metadata.gz: 73c6ef467a04541e8df8888172fda866744c1f3381e0aaeb7991e2ce483366bf4f96e57483bf7af8884af14dbcce528ca2cd297434321d2337910b68ac02ddcf
-  data.tar.gz: 37bca7a88955f38e9364c06c68a40d52a8bd1d07898f70eb429586f1206599164ef288a2716790913bf0b598872234f54438e9465c188ddaa08895a1ec354c64
+  metadata.gz: c19bb138c0d4b7e0f29da94e09501ebecf6e3b25ec710520a7d7d24d2cf028ba546a7919e1c02e62398fa2da7a59426228616fa51f2a4b4ea548c34b9de63508
+  data.tar.gz: fa21f4feaa893acc1d2b6edd9c1bf279e71d3504b2df8d0bdd84cdb095e789f2a53fe84d09011a227974f4f99fabebafafec3429b58ea7abc907aafc8c02ac7c

data/app/controllers/crud_controller.rb

@@ -1,5 +1,5 @@
 class CrudController < ApplicationController
-  before_filter :setup, except: :autocomplete
+  before_action :setup, except: :autocomplete
 
   private
   def setup

data/app/helpers/search_helper.rb

@@ -27,7 +27,7 @@ module SearchHelper
         name = opts[:full_name]
       end
       label = I18n.t("simple_form.labels.#{modelo.name.underscore}.#{name}")
-      label = opts[:label] if opts[:label]
+      label = I18n.t(opts[:label]) if opts[:label]
 
       @buffer << "<div class=\"form-group\">"
       @buffer << raro_label(label,opts)

data/app/raro_crud/raro_crud.rb

@@ -53,9 +53,9 @@ class RaroCrud
     (@@layout[self.to_s.to_sym]) ? @@layout[self.to_s.to_sym] : []
   end
 
-  def self.set_layout(desc,proc = nil)
+  def self.set_layout(desc, proc = nil)
     @@layout[self.to_s.to_sym] = [] unless @@layout[self.to_s.to_sym]
-    @@layout[self.to_s.to_sym] = [desc,proc]
+    @@layout[self.to_s.to_sym] = [desc, proc]
   end
 
   def self.condition_edit_action
@@ -315,7 +315,7 @@ class RaroCrud
     end
     field[:grupo] = true
   end
-  
+
   def self.set_default_label nome, opts
     unless opts[:label].present?
       opts[:label] = "simple_form.labels.#{self.modelo.underscore}.#{nome}"
@@ -404,19 +404,19 @@ class RaroCrud
     @@condition_printing_action[self.to_s.to_sym] = condicao
   end
 
-  def self.acoes(method,desc,proc = nil)
+  def self.acoes(method, desc, proc = nil, options={})
     @@actions[self.to_s.to_sym] = [] unless @@actions[self.to_s.to_sym]
-    @@actions[self.to_s.to_sym].push([method,desc,proc])
+    @@actions[self.to_s.to_sym].push({method: method, desc: desc, proc: proc, options: options})
   end
 
-  def self.links(name,options)
+  def self.links(name, options)
     @@links[self.to_s.to_sym] = [] unless @@links[self.to_s.to_sym]
-    @@links[self.to_s.to_sym].push([name,options])
+    @@links[self.to_s.to_sym].push([name, options])
   end
 
-  def self.opcoes(link,desc,proc = nil)
+  def self.opcoes(link, desc, proc = nil)
     @@options_link[self.to_s.to_sym] = [] unless @@options_link[self.to_s.to_sym]
-    @@options_link[self.to_s.to_sym].push([link,desc,proc])
+    @@options_link[self.to_s.to_sym].push([link, desc, proc])
   end
 
   def self.escopos(scopes)
@@ -437,7 +437,7 @@ class RaroCrud
     @@form_fields[self.to_s.to_sym].last[:sf][:separador] = true
   end
 
-  def self.grupo_formulario(attribute,name,fields=nil)
+  def self.grupo_formulario(attribute, name, fields=nil)
     if fields.nil?
       fields = name
       name = attribute.to_s.singularize.titleize
@@ -454,7 +454,7 @@ class RaroCrud
           value[:sf][atr[0]] = atr[1]
         end
       end
-      @@form_group[self.to_s.to_sym][attribute][:fields].push({attribute: value[:attribute],sf: value[:sf]})
+      @@form_group[self.to_s.to_sym][attribute][:fields].push({attribute: value[:attribute], sf: value[:sf]})
     end
   end
 

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

@@ -55,12 +55,15 @@
 	<%end%>
 	<td class="row">
 		<div class="col-xs-9">
-			<%@crud_helper.actions.each do |a|%>
-				<% if ((a[2].present? && a[2].call(record)) || !a[2].present?) %>
-					<%= 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"}%>
+			<% @crud_helper.actions.each do |action| %>
+				<% if ((action[:proc].present? && action[:proc].call(record)) || !action[:proc].present?) %>
+					<% if action[:options].present? && action[:options][:wiselink].present? && action[:options][:wiselink] %>
+						<% data = {push: "partial", target: "#form"} %>
+					<% end %>
+					<%= link_to I18n.t(action[:desc]), action_crud_path(model: @model.name.underscore, id: record.id, acao: action[:method]), class: "btn btn-primary btn-xs", data: data || {} %>
 				<% end %>
 			<% end %>
-			<%@crud_helper.actions_links.each do |name, options|%>
+			<% @crud_helper.actions_links.each do |name, options| %>
 				<% unless (options[:can].present? && !record.instance_eval(&options[:can])) %>
 					<% if options[:url].present? %>
 						<% url = options[:url] %>
@@ -71,15 +74,19 @@
 						<% 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)%>
+								<%= I18n.t(name) %>
 							</a>
 						<% else %>
 							<a href="<%= url %>" class="btn btn-success btn-xs">
-								<%=I18n.t(name)%>
+								<%= I18n.t(name) %>
 							</a>
 						<% 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"} %>
+						<% if options[:wiselink].present? && options[:wiselink] %>
+							<%= link_to I18n.t(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"} %>
+						<% else %>
+							<%= link_to I18n.t(name), crud_associacao_models_path(model: @model.name.underscore, id: record.id, associacao: options[:associacao].to_s), class: "btn btn-success btn-xs" %>
+						<% end %>
 					<% elsif options[:partial].present? %>
 						<%= render options[:partial], record: record %>
 					<% end %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,8 +1,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
-  before_filter :authenticate_usuario!, :unless => :devise_controller?
-  around_filter :set_current_usuario
-  
+  before_action :authenticate_usuario!, :unless => :devise_controller?
+  around_action :set_current_usuario
+
   rescue_from CanCan::AccessDenied do |exception|
     respond_to do |format|
       format.html {
@@ -19,18 +19,18 @@ class ApplicationController < ActionController::Base
       }
     end
   end
-  
+
   def current_ability
     @current_ability ||= Ability.new(current_usuario)
   end
 
   def set_current_usuario
     Usuario.current = current_usuario
-    yield 
+    yield
   ensure
     Usuario.current = nil
   end
-  
+
   def query
     @resource = Module.const_get(params[:model].classify)
     @q = @resource.search(params[:q])
@@ -47,5 +47,5 @@ class ApplicationController < ActionController::Base
       render :partial => params[:partial]
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -979,7 +979,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects