templus_models 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dd9ee79ddc913b0d324a40d8e70df9151c22a5
-  data.tar.gz: c6213ab6097d334fd99db91e2441f428c6b644fe
+  metadata.gz: b531514ac31823cc29637db8216e63b519bb8cd0
+  data.tar.gz: 48076b17649e28cdf40022c4e9c62da7825998ce
 SHA512:
-  metadata.gz: 9d82f807bf61673a0bedac2f387a64b4ee45bad043edaa5f41a3521095b4cb3426c9499e323ef0f5e2637255be4e1b5f5a51e442696e12ed6a3ce4a24cb4822a
-  data.tar.gz: 8c2c8ca412a8bf279613570396641fb1e3e3e43b98b35387fa44cde5752416164241f9a9079a760be45bd77b9af666f164e1ba789bab2bba04e0cb55396018e1
+  metadata.gz: a49da204233098191f6e4dcd499baa0f2583c17ac3fb0f9ff5256e9e721bf8873516e3e5236fb15f69546421facd17064f81f900398fe3c9bffb11c8e6d8c987
+  data.tar.gz: 09c0e33ea8e3131230b5fcda03d1d7ad716367160efe509821507d5f4f7cf1dfcfd8c2be3f83ea27d505e871e2ae97a84ec51af1ebdfbbb1bbc8be36d9d813f3

data/app/controllers/crud_controller.rb

@@ -4,7 +4,7 @@ class CrudController < ApplicationController
 
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
-    if params[:scope].present?
+    if params[:scope].present? && valid_method?(params[:scope])
       @q = @model.send(params[:scope]).search(params[:q])
     else
       @q = @model.search(params[:q])
@@ -54,7 +54,7 @@ class CrudController < ApplicationController
   def action
     @record = @model.find(@id)
     authorize! :create_or_update, @record if respond_to?(:current_usuario)
-    if @model.method_defined?(params[:acao])
+    if valid_instance_method?(params[:acao])
       if @record.send(params[:acao])
         flash.now[:success] = I18n.t("mensagem_action", acao: params[:acao])
       else
@@ -145,7 +145,11 @@ class CrudController < ApplicationController
     else
       results = @q.result.page(params[:page])
     end
-    method_label = params[:label]
+    if valid_instance_method?(params[:label])
+      method_label = params[:label]
+    else
+      raise "Ação inválida"
+    end
     render json: results.map {|result| {id: result.id, label: result.send(method_label), value: result.send(method_label)} }
   end
 
@@ -188,7 +192,11 @@ class CrudController < ApplicationController
   def setup
     if params[:associacao]
       @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
-      @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
+      if Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao])
+        @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
+      else
+        raise "Ação inválida"
+      end
       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])
@@ -260,4 +268,22 @@ class CrudController < ApplicationController
     end
     group
   end
+  
+  def valid_method?(method)
+    list_methods = []
+    @model.ancestors.each do |m|
+      list_methods << m.methods(false).reject{ |m| /^_/ =~ m.to_s }
+      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.superclass.to_s
+    end
+    list_methods.flatten.include? method.to_sym
+  end
+  
+  def valid_instance_method?(method)
+    list_methods = []
+    @model.ancestors.each do |m|
+      list_methods << m.instance_methods(false).reject{ |m| /^_/ =~ m.to_s }
+      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.superclass.to_s
+    end
+    list_methods.flatten.include? method.to_sym
+  end
 end

data/app/helpers/crud_helper.rb

@@ -176,10 +176,10 @@ module CrudHelper
   def render_field_file(field)
 		if imagem?(field) && field.respond_to?(:thumb)
       if is_active_action("printing")
-        pdf_image_tag(field)
+        pdf_image_tag(field, width: '100px')
       else
         link_to field.url, target: "_blank" do
-          image_tag(field.url(:thumb))
+          image_tag(field.url(:thumb), width: '100px')
         end
       end
 		elsif video?(field)

data/app/views/crud/printing.pdf.erb

@@ -9,7 +9,11 @@
             <% if @crud_helper.logo_printing_field.present? %>
               <div class="col-xs-3">
                 <% if @crud_helper.logo_printing_field[:field].present? %>
-                  <%= render_field_file(@record.send(@crud_helper.logo_printing_field[:field])) %>
+                  <% if @record.send(@crud_helper.logo_printing_field[:field]).present? %>
+                    <%= render_field_file(@record.send(@crud_helper.logo_printing_field[:field])) %>
+                  <% else %>
+                    <%= pdf_image_tag(Templus.logo, width: '100px') %>
+                  <% end %>
                 <% elsif @crud_helper.logo_printing_field[:url].present? %>
                   <%= pdf_image_tag(@crud_helper.logo_printing_field[:url], width: '100px') %>
                 <% end %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails