templus_models 2.0.16 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87c047b42820aa87baba1d59157623e25602827
-  data.tar.gz: d0a10386ada91e1281c4577d9c75a556b17b6b4d
+  metadata.gz: b2a32e3baae3e617d1b3d1ba52b72275de3e69f7
+  data.tar.gz: 94f286c2f34c143da3381f2eb9cb1169b826cc51
 SHA512:
-  metadata.gz: ad3263d6b8082eeb382a3cbf0c89f32348ec09cfa86338dd33883849dedf943d92f08ff10f7fb2f0e78b8bc5b98b253ff120db81215704575d49ae2d717c2bc9
-  data.tar.gz: b8621fe894e86228491e7f00b402d2e63677027dad24ae1b10a5bb11e51d252bcf5c40cee31062d80a9a6561ffec4e5f00f26aa6590fd9a0da20228d4bfc710f
+  metadata.gz: 73c6ef467a04541e8df8888172fda866744c1f3381e0aaeb7991e2ce483366bf4f96e57483bf7af8884af14dbcce528ca2cd297434321d2337910b68ac02ddcf
+  data.tar.gz: 37bca7a88955f38e9364c06c68a40d52a8bd1d07898f70eb429586f1206599164ef288a2716790913bf0b598872234f54438e9465c188ddaa08895a1ec354c64

data/app/controllers/crud_controller.rb

@@ -1,26 +1,46 @@
 class CrudController < ApplicationController
   before_filter :setup, except: :autocomplete
 
+  private
+  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])
+      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])
+      @clean_url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao])
+      @model_permission = c_helper.constantize
+      @id = params[:associacao_id] if params[:associacao_id]
+    else
+      @model = Module.const_get(params[:model].camelize)
+      @model_permission = @model
+      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
+      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
+      @clean_url = crud_models_path(model: params[:model])
+      @id = params[:id] if params[:id]
+    end
+  end
+
+  public
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
-    if params[:scope].present? && valid_method?(params[:scope])
+    if params[:scope].present?
       @q = @model.send(params[:scope]).search(params[:q])
     else
       @q = @model.search(params[:q])
     end
-
     if @q.sorts.empty?
-      if @crud_helper.order_field.to_s.include?("desc") || @crud_helper.order_field.to_s.include?("asc")
-        @q.sorts = @crud_helper.order_field.to_s
+      if "#{@crud_helper.order_field}".include?("desc") or "#{@crud_helper.order_field}".include?("asc")
+        @q.sorts = "#{@crud_helper.order_field}"
       else
         @q.sorts = "#{@crud_helper.order_field} asc"
       end
     end
-
     if respond_to?(:current_usuario)
-      @records = @q.result.accessible_by(current_ability, :read).uniq.page(params[:page]).per(@crud_helper.per_page)
+      @records = @q.result.accessible_by(current_ability, :read).page(params[:page]).per(@crud_helper.per_page)
     else
-      @records = @q.result.uniq.page(params[:page]).per(@crud_helper.per_page)
+      @records = @q.result.page(params[:page]).per(@crud_helper.per_page)
     end
     @titulo = @model.name.pluralize
     render partial: 'records' if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
@@ -55,13 +75,13 @@ class CrudController < ApplicationController
   def action
     @record = @model.find(@id)
     authorize! :create_or_update, @record if respond_to?(:current_usuario)
-    if valid_instance_method?(params[:acao])
+    if @model.method_defined?(params[:acao])
       if @record.send(params[:acao])
         flash.now[:success] = I18n.t("mensagem_action", acao: params[:acao])
       else
         flash.now[:error] = I18n.t("mensagem_erro_action", acao: params[:acao])
       end
-      redirect_to @url
+      redirect_to "#{@url}?page=#{params[:page]}"
     else
       @titulo = @record.to_s
       @texto = params[:acao]
@@ -84,7 +104,7 @@ class CrudController < ApplicationController
     respond_to do |format|
       if @saved
         flash[:success] = params[:id].present? ? I18n.t("updated", model: I18n.t("model.#{@model.name.underscore}")) : I18n.t("created", model: I18n.t("model.#{@model.name.underscore}"))
-        format.html { redirect_to @url }
+        format.html { redirect_to "#{@url}?page=#{params[:page]}" }
         unless params[:render] == 'modal'
           format.js { render action: :index}
         else
@@ -119,19 +139,13 @@ class CrudController < ApplicationController
   def query
     authorize! :read, @model_permission if respond_to?(:current_usuario)
     @resource = @model
-    if params[:scope].present? && valid_method?(params[:scope])
-      @q = @model.send(params[:scope]).search(params[:q])
-    else
-      @q = @model.search(params[:q])
-    end
+    @q = @resource.search(params[:q])
     @q.sorts = 'updated_at desc' if @q.sorts.empty?
-
     if respond_to?(:current_usuario)
-      results = @q.result.accessible_by(current_ability).uniq.page(params[:page])
+      results = @q.result.accessible_by(current_ability).page(params[:page])
     else
-      results = @q.result.uniq.page(params[:page])
+      results = @q.result.page(params[:page])
     end
-
     instance_variable_set("@#{params[:var]}", results)
     if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
       render :partial => params[:partial]
@@ -148,46 +162,36 @@ class CrudController < ApplicationController
     @q = @model.search(parametros)
     @q.sorts = 'updated_at desc' if @q.sorts.empty?
     if respond_to?(:current_usuario)
-      results = @q.result.accessible_by(current_ability).uniq.page(params[:page])
+      results = @q.result.accessible_by(current_ability).page(params[:page])
     else
-      results = @q.result.uniq.page(params[:page])
-    end
-    if valid_instance_method?(params[:label])
-      method_label = params[:label]
-    else
-      raise "Ação inválida"
+      results = @q.result.page(params[:page])
     end
+    method_label = params[:label]
     render json: results.map {|result| {id: result.id, label: result.send(method_label), value: result.send(method_label)} }
   end
 
   def listing
     authorize! :read, @model_permission if respond_to?(:current_usuario)
-    if params[:scope].present? && valid_method?(params[:scope])
-      @q = @model.send(params[:scope]).search(params[:q])
-    else
-      @q = @model.search(params[:q])
-    end
-
-    if @q.sorts.empty?
-      if @crud_helper.order_field.to_s.include?("desc") || @crud_helper.order_field.to_s.include?("asc")
-        @q.sorts = @crud_helper.order_field.to_s
-      else
-        @q.sorts = "#{@crud_helper.order_field} asc"
-      end
-    end
-    
+    @q = @model.search(params[:q])
     if respond_to?(:current_usuario)
-      @records = @q.result.uniq.accessible_by(current_ability)
+      @records = @q.result.accessible_by(current_ability)
     else
-      @records = @q.result.uniq
+      @records = @q.result
     end
     report_name = "#{@crud_helper.title}_#{DateTime.now.strftime('%Y%m%d')}"
     respond_to do |format|
-      format.xls { headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls" }
+      format.xls {headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls"}
       format.pdf do
-        pdf = generate_pdf_report(@crud_helper.setup_report_listing, 'crud/listing.pdf.erb')
+        pdf = WickedPdf.new.pdf_from_string(
+          render_to_string('crud/listing.pdf.erb'),
+          encoding: 'UTF-8',
+          page_size: 'A4',
+          show_as_html: params[:debug],
+          margin: { top: 20, bottom: 20 }
+        )
         send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
       end
+      format.html
     end
   end
 
@@ -197,7 +201,13 @@ class CrudController < ApplicationController
     report_name = "#{@record}_#{DateTime.now.strftime('%Y%m%d')}"
     respond_to do |format|
       format.pdf do
-        pdf = generate_pdf_report(@crud_helper.setup_report_printing, 'crud/printing.pdf.erb')
+        pdf = WickedPdf.new.pdf_from_string(
+          render_to_string('crud/printing.pdf.erb'),
+          encoding: 'UTF-8',
+          page_size: 'A4',
+          show_as_html: params[:debug],
+          margin: { top: 20, bottom: 20 }
+        )
         send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
       end
       format.html
@@ -205,50 +215,8 @@ class CrudController < ApplicationController
   end
 
   private
-  def generate_pdf_report(opts, layout)
-    html = render_to_string(layout)
-    options = {
-      encoding: 'UTF-8',
-      orientation: opts[:orientation],
-      page_size: 'A4',
-      show_as_html: params[:debug],
-      margin: { top: opts[:top], bottom: opts[:bottom] }
-    }
-    if opts[:header].present?
-      options[:header] = {content: render_to_string(template: opts[:header], locals: {title: @crud_helper.title})}
-    end
-    if opts[:footer].present?
-      options[:footer] = {content: render_to_string(template: opts[:footer])}
-    end
-    WickedPdf.new.pdf_from_string(html, options)
-  end
-
-  def setup
-    if params[:associacao]
-      @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
-      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])
-      @clean_url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao])
-      @model_permission = c_helper.constantize
-      @id = params[:associacao_id] if params[:associacao_id]
-    else
-      @model = Module.const_get(params[:model].camelize)
-      @model_permission = @model
-      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
-      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
-      @clean_url = crud_models_path(model: params[:model])
-      @id = params[:id] if params[:id]
-    end
-  end
-
   def params_permitt
-    params.require(@model.name.underscore.gsub('/','_').to_sym).permit(fields_model)
+    params.require(@model.name.underscore.to_sym).permit(fields_model)
   end
 
   def fields_model
@@ -264,16 +232,12 @@ class CrudController < ApplicationController
             fields << {"#{field[:attribute].to_s.singularize}_ids".to_sym => []}
           end
         elsif @model.columns_hash[field[:attribute].to_s]
-          if @model.columns_hash[field[:attribute].to_s].cast_type.class == ActiveRecord::Type::Serialized
-            fields << {field[:attribute] => []}
-          else
-            fields << field[:attribute]
-          end
+          fields << field[:attribute]
         end
       end
     end
     #TODO - Deprecated
-    @crud_helper.form_groups.each do |key, groups|
+  	@crud_helper.form_groups.each do |key, groups|
       fields << permitt_group(fields, key, groups[:fields],@model)
     end
     #Fim - Deprecated
@@ -300,32 +264,10 @@ class CrudController < ApplicationController
             group[chave] << {"#{field[:attribute].to_s.singularize}_ids".to_sym => []}
           end
         elsif (modelo.columns_hash[field[:attribute].to_s] || (modelo.respond_to?(:params_permitt) && modelo.params_permitt.include?(field[:attribute].to_sym)))
-          if modelo.columns_hash[field[:attribute].to_s].cast_type.class == ActiveRecord::Type::Serialized
-            group[chave] << {field[:attribute] => []}
-          else
-            group[chave] << field[:attribute]
-          end
+          group[chave] << field[:attribute]
         end
       end
     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 m.superclass.to_s == "ActiveRecord::Base"
-    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 m.superclass.to_s == "ActiveRecord::Base"
-    end
-    list_methods.flatten.include? method.to_sym
-  end
 end

data/app/helpers/crud_helper.rb

@@ -1,11 +1,11 @@
 module CrudHelper
 
   def is_active_controller(controller_name)
-    params[:controller] == controller_name ? "active" : nil
+      params[:controller] == controller_name ? "active" : nil
   end
 
   def is_active_action(action_name)
-    params[:action] == action_name ? "active" : nil
+      params[:action] == action_name ? "active" : nil
   end
 
   def is_raro_crud(classe)
@@ -110,12 +110,12 @@ module CrudHelper
     permissions.uniq.flatten
   end
 
-  def render_plus_button(field, f, modelo, record, options = {})
-    field[:sf][:wrapper] = options[:wrapper] || :with_button
-    render_field(field, f, modelo, record)
+  def render_plus_button(field,f,modelo,record)
+    field[:sf][:wrapper] = :with_button
+    render_field(field,f,modelo,record)
   end
 
-  def render_field(field, f, modelo, record)
+  def render_field(field,f,modelo,record)
     field[:sf][:wrapper] ||= :default
     if field[:sf].present? && field[:sf][:if].present?
       return unless field[:sf][:if].call(f.object)
@@ -174,11 +174,11 @@ module CrudHelper
   end
 
   def render_field_file(field)
-		if imagem?(field) && field.respond_to?(:thumb)
-      if is_active_action("printing") || is_active_action("listing")
-        pdf_image_tag(field, width: '100px')
+		if imagem?(field) && field.url(:thumb)
+      if is_active_action("printing")
+        wicked_pdf_image_tag(field.url(:thumb))
       else
-        image_tag(field.url(:thumb), width: '100px')
+        image_tag(field.url(:thumb))
       end
 		elsif video?(field)
 			link_to field, field.url, target: "_blank"
@@ -196,71 +196,45 @@ module CrudHelper
   end
 
   #Permissions
-  def should_view?(crud_helper, record)
+  def should_view?(crud_helper,record)
     return false unless can?(:read, record)
     return true if crud_helper.condition_view_action.nil?
     crud_helper.condition_view_action.call(record)
   end
 
-  def should_edit?(crud_helper, record)
+  def should_edit?(crud_helper,record)
     return false unless can?(:update, record)
     return true if crud_helper.condition_edit_action.nil?
     crud_helper.condition_edit_action.call(record)
   end
 
-  def should_destroy?(crud_helper, record)
+  def should_destroy?(crud_helper,record)
     return false unless can?(:destroy, record)
     return true if crud_helper.condition_destroy_action.nil?
     crud_helper.condition_destroy_action.call(record)
   end
 
-  def should_listing?(crud_helper, model)
+  def should_listing?(crud_helper,model)
     return false unless can?(:read, model)
     return true if crud_helper.condition_listing_action.nil?
     crud_helper.condition_listing_action.call(model)
   end
 
-  def should_listing_excel?(crud_helper, model)
+  def should_listing_excel?(crud_helper,model)
     return false unless can?(:read, model)
     return true if crud_helper.condition_listing_excel.nil?
     crud_helper.condition_listing_excel.call(model)
   end
 
-  def should_listing_pdf?(crud_helper, model)
+  def should_listing_pdf?(crud_helper,model)
     return false unless can?(:read, model)
     return true if crud_helper.condition_listing_pdf.nil?
     crud_helper.condition_listing_pdf.call(model)
   end
 
-  def can_print_pdf?(crud_helper, record)
+  def should_printing?(crud_helper,record)
     return false unless can?(:read, record)
     return true if crud_helper.condition_printing_action.nil?
     crud_helper.condition_printing_action.call(record)
   end
-
-
-  private
-
-  def pdf_image_tag(field, options = {})
-    if Rails.env.development? || Rails.env.test?
-      # Unless running a web server that can process 2 requests at the same
-      # time, trying to insert an image in a PDF creates a deadlock: the server
-      # can't finish processing the PDF request until it gets the image, but it
-      # can't start processing the image request until it has finished
-      # processing the PDF request.
-      # This will not be a problem in production, but in dev, a workaround is
-      # to base64 the image and insert its contents into the HTML
-      if field.respond_to?(:thumb)
-        image_data = File.read(field.thumb.path)
-      else
-        image_data = Rails.application.assets[field].to_s
-      end
-      image_tag("data:image/png;base64,#{::Base64.encode64(image_data)}", options)
-    else
-      if field.respond_to?(:thumb)
-        field = field.thumb.url
-      end
-      wicked_pdf_image_tag(field, options)
-    end
-  end
 end

data/app/helpers/search_helper.rb

@@ -1,7 +1,7 @@
 module SearchHelper
 
-  def raro_search_form(model, partial, collection_name, url, scope = nil, sort = nil)
-      @buffer = raro_before_form(model, partial, collection_name, url, scope, sort)
+  def raro_search_form(model,partial,collection_name,url,sort = nil)
+      @buffer = raro_before_form(model,partial,collection_name,url,sort)
       @model = model
       yield
       @buffer << raro_submit(I18n.t('search'))
@@ -16,7 +16,7 @@ module SearchHelper
       "<div><input type='submit' class='btn btn-primary pull-right' value='#{name}' id='submit_raro_search'></div><br><br>"
     end
 
-    def raro_field(name, opts = {})
+    def raro_field (name, opts = {})
       modelo = opts[:model] || @model
       unless opts[:model]
         prototype = @model.columns_hash[name.to_s]
@@ -26,7 +26,7 @@ module SearchHelper
         modelo = Module.const_get(opts[:model])
         name = opts[:full_name]
       end
-      label = "simple_form.labels.#{modelo.name.underscore}.#{name}"
+      label = I18n.t("simple_form.labels.#{modelo.name.underscore}.#{name}")
       label = opts[:label] if opts[:label]
 
       @buffer << "<div class=\"form-group\">"
@@ -78,22 +78,20 @@ module SearchHelper
     end
 
     def raro_input_as(name,type,opts)
-      if opts[:collection_if] and opts[:collection_if].class == Proc
-        opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval(&opts[:collection_if])
-      end
       case opts[:as]
       when :select
+        if opts[:collection_if] and opts[:collection_if].class == Proc
+          opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval &opts[:collection_if]
+        end
         raro_select(name,opts,opts[:collection])
       when :hidden
         return raro_hidden_field(name,opts[:value],opts)
       when :string
         raro_text_field(name, opts)
       when :range
-        raro_range(name, opts)
+        raro_range(name)
       when :monthyear
         raro_monthyear(name, opts)
-      when :check_boxes
-        raro_check_boxes(name, opts, opts[:collection])
       end
     end
 
@@ -107,23 +105,6 @@ module SearchHelper
       return raro_select("q[#{model_name}_id_eq]",opts,collection)
     end
 
-    def raro_check_boxes(name, opts, collection)
-      unless opts[:model]
-        name = "q[#{name}_eq]"
-      end
-      buf = "<div class='col-sm-12'>"
-      input_class = opts[:input_html].try(:[], :class)
-      collection.each do |e|
-        buf << "<span class='checkbox' style='display: inline;'>"
-        buf << "<label class='control-label'>"
-        buf << "<input class='form-control check_boxes optional #{input_class}' type='checkbox' value='#{e[0]}' name='#{name}' style=''> #{e[1]}"
-        buf << '</label>'
-        buf << '</span>'
-      end
-      buf << '</div>'
-      return buf
-    end
-
     def raro_select(name,opts,collection)
       unless opts[:model]
         name = "q[#{name}_eq]"
@@ -134,9 +115,7 @@ module SearchHelper
       else
         buf << "<select name=#{name} class='form-control'>"
       end
-      if opts[:include_blank].nil? || (!opts[:include_blank].nil? && ActiveRecord::Type::Boolean.new.type_cast_from_user(opts[:include_blank]))
-        buf << "<option value='' selected>#{I18n.t('search')}</option>"
-      end
+      buf <<"<option value ='' selected>#{I18n.t('search')}</option>"
       collection.each do |e|
         buf << "<option value=#{e[0]}>#{e[1]}</option>"
       end
@@ -149,7 +128,7 @@ module SearchHelper
       if opts[:as] and opts[:as] == :hidden
         ""
       else
-      "<label class='col-sm-2 control-label'>#{I18n.t(name)}</label>"
+      "<label class='col-sm-2 control-label'>#{name}</label>"
       end
     end
 
@@ -231,33 +210,26 @@ module SearchHelper
       </div></div>"
     end
 
-    def raro_range(name, opts={})
-      attrs_gteq, attrs_lteq = "", ""
-
-      if opts[:placeholders]
-        placeholders = opts[:placeholders]
-        attrs_gteq << "placeholder='#{placeholders.first}' "
-        attrs_lteq << "placeholder='#{placeholders.last}' "
-      end
-
+    def raro_range(name)
       buffer = ""
       buffer += "<div class='col-sm-4'>"
-      buffer += "<input type='text' name='q[#{name}_gteq]' class='form-control' #{attrs_gteq}/>"
+      buffer += "<input type='text' name='q[#{name}_gteq]' class='form-control'/>"
       buffer += "</div>"
       buffer += "<div class='col-sm-4 range-separator'>"
-      buffer += "<input type='text' name='q[#{name}_lteq]' class='form-control' #{attrs_lteq}/>"
+      buffer += "<input type='text' name='q[#{name}_lteq]' class='form-control'/>"
       buffer += "</div>"
       buffer
     end
 
-    def raro_before_form(model, partial, var, url, scope, sort)
+    def raro_before_form(model,partial,var,url,sort)
       buffer = "<div id='search_box'>"+
       "<form method='get' class=form-horizontal action='#{url}' data-push='partial' data-target='#form'>" +
       "<input type='hidden' name='partial' value='#{partial}'>" +
       "<input type='hidden' name='var' value='#{var}'>"
-      buffer << "<input type='hidden' name='q[s]' value='#{sort}'>" if sort.present?
-      buffer << "<input type='hidden' name='scope' value='#{scope}'>" if scope.present?
-      buffer
+      if sort
+         buffer << "<input type='hidden' name='q[s]' value='#{sort}'>"
+       end
+       buffer
     end
 
     def raro_after_form
@@ -289,7 +261,6 @@ module SearchHelper
       <option value=not_cont>#{I18n.t('not_contains')}</option>
       <option value=start>#{I18n.t('begins')}</option>
       <option value=end>#{I18n.t('ends')}</option>
-      <option value=has_any_term>#{I18n.t('word')}</option>
       </select>"
     end