templus_models 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599fc4c702a8e03706fe1237d7596a252b23e1c1
-  data.tar.gz: 54c5350bc61712bd5b981bda2a8edfd1818ea8a1
+  metadata.gz: 5d430cf39c020a63c9cf7e16b248a1ee4c71c040
+  data.tar.gz: cf28b29eb8f4d46fa53a1cd6cf84663f3b1f94d1
 SHA512:
-  metadata.gz: 3d76b7da4125981bf52c8cb402889e25eacca4886dc1dc1457d4cbde8acbd31f7ca92c3acb9fe3a08a74a88cbfd38a34f3f46b9d6a68df0c5e8892d785ce2dcf
-  data.tar.gz: 4c184c1a561e0a59b14a40ef4187d9f248b39ecb76d2b321f10be1993a1f35d5cccf98ff5feecb7ff2b7bad6553c016c0a96f3f902543128786bf5c07d86b32f
+  metadata.gz: 2fb6d1d75db08aa1656e3d8ed3216a3b0a85180fc83319e018f1da91f60b5380ad0b0b30ba61b6d9c1c1fedad6c3a23a18bd5668bd2cd9b3a469442aa7fb9b82
+  data.tar.gz: 12aa1d2ad34d7d1c8c7374571edadf76d78488542748beb085c6bc3a0e6d392f5f66b351d237df669ad0b2fd2bf1d02dcb951249d52831ecc33ef85e8944e850

data/app/controllers/crud_controller.rb

@@ -10,8 +10,8 @@ class CrudController < ApplicationController
       @q = @model.search(params[:q])
     end
     if @q.sorts.empty?
-      if "#{@crud_helper.order_field}".include?("desc") or "#{@crud_helper.order_field}".include?("asc")
-        @q.sorts = "#{@crud_helper.order_field}"
+      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
@@ -159,7 +159,18 @@ class CrudController < ApplicationController
 
   def listing
     authorize! :read, @model_permission if respond_to?(:current_usuario)
-    @q = @model.search(params[:q])
+    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
     if respond_to?(:current_usuario)
       @records = @q.result.accessible_by(current_ability)
     else
@@ -168,6 +179,16 @@ class CrudController < ApplicationController
     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.pdf do
+        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
     end
   end
 

data/app/helpers/search_helper.rb

@@ -134,7 +134,9 @@ module SearchHelper
       else
         buf << "<select name=#{name} class='form-control'>"
       end
-      buf <<"<option value ='' selected>#{I18n.t('search')}</option>"
+      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
       collection.each do |e|
         buf << "<option value=#{e[0]}>#{e[1]}</option>"
       end

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.13"
+  VERSION = "3.0.14"
 end