pg_rails 7.6.36 → 7.6.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15826d7f758337068682991844f212e34828b09f4fe9e6ad2e4e8a134b197ecb
-  data.tar.gz: 54c484be1abf1c860de9f5a73b3f039d588a568fd9d45e72c96d370609003571
+  metadata.gz: d78d6754e8cd67e2b293e26fa01585fefdefb68fd030a3ad00a420119ecdcdff
+  data.tar.gz: 62cf672c47ff40c4bb45d58880643955450d7db7069ebd4df92cffce4283bba8
 SHA512:
-  metadata.gz: 96b9f2c3933b26fd11784fc7310e444cc3acee80ac459764f9b4b642f142ddae0eb37a308a54fb9cc924a591c08fd297b740a25f65fc24c86fdc0f6637139c39
-  data.tar.gz: 6297e77049497b5c341e7260d22b9fe36e6dd7e0d8d94c37c8037df36eddf45c2c9c5ef3f9c80bd2ac1421f54ad50e1fba6bcbb17c9491dc5c0d5a26224d3bc5
+  metadata.gz: 7443db791d97a49a3755d4922c855202522c4a1a980b4c66f44fa45733131827f5c88cc059a88ad2f21495d21e3f226d9fe39ad8af2d420bf2a28ee05f177924
+  data.tar.gz: 870d9f4006606617247fecd04e93a832ecd13da8d844e0f1086cc4dfdd9da735fd6508167a4e8e29f658ebb5763867a0e68c662d86a889c019f0d1f20d246851

data/pg_engine/app/controllers/pg_engine/require_sign_in.rb

@@ -5,7 +5,8 @@ module PgEngine
     def self.included(clazz)
       clazz.include RansackMemory::Concern
       clazz.prepend_before_action :authenticate_user!
-      clazz.before_action :save_and_load_filters
+      # dsfil: dont save filters
+      clazz.before_action :save_and_load_filters, unless: -> { params[:dsfil] == '1' }
     end
   end
 end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -51,11 +51,15 @@ module PgEngine
       @campos.each { |campo| @filtros[campo] = {} }
     end
 
-    def opciones(campo, opciones)
+    def configure(campo, config)
       # TODO: mergear
-      @filtros[campo] = opciones
+      @filtros[campo] = config
     end
 
+    # TODO: deprecar
+    alias opciones configure
+    deprecate :opciones, deprecator: PgEngine.deprecator
+
     # querys customizadas por campo
     def query(campo, &block)
       @filtros[campo] = {} if @filtros[campo].nil?
@@ -160,8 +164,8 @@ module PgEngine
       raise PgEngine::Error, 'se debe setear el form' if @form.blank?
 
       res = ''
-      @filtros.each do |campo, opciones|
-        if opciones[:oculto] ||
+      @filtros.each do |campo, config|
+        if config[:oculto] ||
            (options[:except].present? && options[:except].include?(campo.to_sym)) ||
            (options[:only].present? && options[:only].exclude?(campo.to_sym))
           next
@@ -249,10 +253,21 @@ module PgEngine
     end
 
     def filtro_select(campo, placeholder = '')
-      map = @clase_modelo.send(sin_sufijo(campo)).values.map do |key|
-        [I18n.t("#{@clase_modelo.to_s.underscore}.#{campo}.#{key}", default: key.humanize),
-         key.value]
-      end
+      config = @filtros[campo]
+
+      map = if config[:options].present?
+              if config[:options].first.is_a? Enumerize::Value
+                config[:options].map { |v| [v.text, v.value] }
+              else
+                config[:options]
+              end
+            else
+              @clase_modelo.send(sin_sufijo(campo)).values.map do |key|
+                [I18n.t("#{@clase_modelo.to_s.underscore}.#{sin_sufijo(campo)}.#{key}", default: key.text),
+                 key.value]
+              end
+            end
+
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: "filter #{active_class(campo)}" do
           suf = extraer_sufijo(campo)

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.36'
+  VERSION = '7.6.37'
 end
 # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.36
+  version: 7.6.37
 platform: ruby
 authors:
 - Martín Rosso