effective_resources 2.19.10 → 2.19.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc082069435ea9d5601f7d80eb676c1cbba2f63372659236151412c00f8feea
-  data.tar.gz: bed63eedbeb63602746e0e186d84d6f56c2635415ce9eff19a6e33e69aeb973a
+  metadata.gz: 1be94e8ced0d5bd8c7e28d738435ca83614afe8caa6b7360fd760ec6a14b217c
+  data.tar.gz: 51c5577ee73d2c4206929d020f32ec29ac0488a50f125a264522a267610ba3b8
 SHA512:
-  metadata.gz: 60329f1197ae967e67df7cf12eb1e9be25d6074a8a8e8993fbfb29275e3deeeabb2fcca589f8d50c6278d7b9e54d2ebed8e29413c1f209f78501dddaa66d9f25
-  data.tar.gz: eadc102a68f6b214bce5664c04f0a4a5ad51c435b12f040d760a94e5667f6ed86522770c48b4456dd6638769e5385b3c934068c6ca21bd27886992d39e9c9c2c
+  metadata.gz: e63dac719bd2e57f8d05c5c83d9c1c4ba7170e956097c6d843e65d10bfb1e9e44613bc5b40407439e68dd9c288f5a6ea7c31d86e103251993d0de3d6b669e721
+  data.tar.gz: 00f602d5582cf3e6d3cb1313bce80912a5937412ea513683b94e979b8561f5256433875d4d0838f5a7060257c3e8d90cc56fe143a6d5f639bc9e295a4de5e5a7

data/app/models/effective/attribute.rb

@@ -83,7 +83,7 @@ module Effective
           date = if digits.first.length == 4  # 2017-01-10
             (Time.zone.local(*digits) rescue nil)
           else # 01/10/2016
-            year = digits.find { |d| d.length == 4}
+            year = digits.find { |d| d.length == 4 }
             digits = [year] + (digits - [year])
             (Time.zone.local(*digits) rescue nil)
           end

data/app/models/effective/resources/relation.rb

@@ -299,7 +299,7 @@ module Effective
               .where(ActiveStorage::Blob.arel_table[:filename].matches("%#{term}%"))
 
           when :date, :datetime
-            if value.kind_of?(String)
+            if value.kind_of?(String) && term.respond_to?(:strftime)
               end_at = (
                 case (value.to_s.scan(/(\d+)/).flatten).length
                 when 1 ; term.end_of_year     # Year
@@ -323,8 +323,9 @@ module Effective
               else
                 relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", value.beginning_of_day, value.end_of_day)
               end
+            elsif term.respond_to?(:strftime) == false && operation.to_s.include?('days_ago') == false
+              relation.none # It's an invalid entered date 
             end
-
           when :effective_obfuscation
             term = Attribute.new(as, klass: (associated(name).try(:klass) || klass)).parse(value, name: name)
             relation.where(attribute.eq((value == term ? 0 : term)))
@@ -338,9 +339,13 @@ module Effective
             relation.with_role(term)
 
           when :time
-            timed = relation.where("EXTRACT(hour from #{sql_column}) = ?", term.utc.hour)
-            timed = timed.where("EXTRACT(minute from #{sql_column}) = ?", term.utc.min) if term.min > 0
-            timed
+            if term.respond_to?(:strftime)
+              timed = relation.where("EXTRACT(hour from #{sql_column}) = ?", term.utc.hour)
+              timed = timed.where("EXTRACT(minute from #{sql_column}) = ?", term.utc.min) if term.min > 0
+              timed
+            else
+              relation.none # It's an invalid entered date 
+            end
         end
 
         return searched if searched

data/app/views/effective/resource/_actions.html.haml

@@ -2,5 +2,7 @@
   - action = opts.delete(:action)
   = link_to(label, (effective_resource.action_path(action, resource) || '#'), opts)
 
-= instance_exec(resource, &format_block) if local_assigns[:format_block]
-= yield if block_given?
+- if local_assigns[:format_block] && local_assigns[:datatable]
+  = instance_exec(resource, datatable, &format_block)
+
+= yield(resource) if block_given?

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -5,5 +5,7 @@
 
     = dropdown_link_to(label, (effective_resource.action_path(action, resource) || '#'), opts)
 
-  = instance_exec(resource, &format_block) if local_assigns[:format_block]
+  - if local_assigns[:format_block] && local_assigns[:datatable]
+    = instance_exec(resource, datatable, &format_block)
+
   = yield(resource) if block_given?

data/app/views/effective/resource/_actions_glyphicons.html.haml

@@ -4,5 +4,7 @@
 
   = glyphicon_to(action, (effective_resource.action_path(action, resource) || '#'), opts)
 
-= instance_exec(resource, &format_block) if local_assigns[:format_block]
+- if local_assigns[:format_block] && local_assigns[:datatable]
+  = instance_exec(resource, datatable, &format_block)
+
 = yield(resource) if block_given?

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.19.10'.freeze
+  VERSION = '2.19.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.10
+  version: 2.19.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails