effective_resources 2.4.4 → 2.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f1cadfb1389e910933f803de6666e0951e5f9f616a9b309e9bdb90a660cc6701
4
- data.tar.gz: 2bce5994615b5bc9c80c2dfe31da4476333d8eb6c77d8443f80a2001680ee760
3
+ metadata.gz: b34bdcaa231b87cff3e1f0ed43b8a1ecf7a8de5dfb784dae9dfcc677bb2a3754
4
+ data.tar.gz: 182008fc51596a0039e957fe9dfb49531c5e5b58466e4bf8d4f4d3f63d0091dd
5
5
  SHA512:
6
- metadata.gz: 2188480dca4ed8d2a6bdd66a0867160338ecd7d5a9bc7e210c3ee5bb27594cc7eb53de5970714fb8e3b2551d1b3ea05b553d716d5f8838566dd7cef5df091c30
7
- data.tar.gz: f6a0ef0ed60c286568c9a7a9fef1f6615557370c461c6c8159ead387df00cb170fb3e58c21ad8ccf403196b76ac77df21b0ed073e948269851bb180bbe5bac74
6
+ metadata.gz: b8a5e3bec0689b942e6bb95b8dc1ced888435dba9dc423a2b76684a88ce771ac7c1cbb6db6313f9f3c1454b4bee730d7571ab7a55ada80fcc341c042a729deb1
7
+ data.tar.gz: 0c983b39196510bbc506a2c8e6090310530632a015f68dfb5f99d13f65d4f1bac43dbbf82ebb6154eb4be7322562f7ea8f3903eced1ef1fb92f01a3b0762b7f8
@@ -71,7 +71,7 @@ module HasManyPurgable
71
71
 
72
72
  def has_many_purgable_mark_for_destruction
73
73
  has_many_purgable_attachments.each do |name|
74
- Array(public_send(name)).each { |attachment| attachment.mark_for_destruction }
74
+ Array(public_send(name)).each { |attachment| attachment.mark_for_destruction unless attachment.new_record? }
75
75
  end
76
76
 
77
77
  true
@@ -80,7 +80,7 @@ module HasManyPurgable
80
80
  def has_many_purgable_purge
81
81
  has_many_purgable_attachments.each do |name|
82
82
  Rails.logger.info "[has_many_purgable] Purging #{name} attachments"
83
- Array(public_send(name)).each { |attachment| attachment.purge }
83
+ Array(public_send(name)).each { |attachment| attachment.purge if attachment.marked_for_destruction? }
84
84
  end
85
85
 
86
86
  true
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '2.4.4'.freeze
2
+ VERSION = '2.4.6'.freeze
3
3
  end
@@ -179,7 +179,9 @@ module EffectiveResources
179
179
  end
180
180
 
181
181
  def self.et(resource, attribute = nil)
182
- if resource.respond_to?(:model_name) == false
182
+ if resource.respond_to?(:datatable_name)
183
+ resource.datatable_name
184
+ elsif resource.respond_to?(:model_name) == false
183
185
  value = I18n.t(resource)
184
186
  raise("Missing translation: #{resource}") if value.start_with?('translation missing:')
185
187
  value
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.4
4
+ version: 2.4.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-07 00:00:00.000000000 Z
11
+ date: 2023-03-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails