effective_resources 2.8.3 → 2.8.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a3306eaeb2757f8d71427567e38353c13c2ff2b7ebc9bfd4fa59dbfe24af3ed9
4
- data.tar.gz: 561544b09df06f7210d0dd07a48547ac3b2d8661654fb0129e92f7ad413a4a56
3
+ metadata.gz: 40f7d69324aa9033e2ae26f51dda5216126ce457aa774cf4910ac46e7fae1c64
4
+ data.tar.gz: c451889a8ba4bdf4e3d2ad6f50ccce98c71f7c3e365784ee34d55e69d3edcd09
5
5
  SHA512:
6
- metadata.gz: e7ca40c7ee7b3aa67659a45f62ecc86bd34e1ca3454f1baf0c601cd4437b960064ad9b58645dca6cfac931e327e86cbb39875dcda44eff32459caa7c94d6649c
7
- data.tar.gz: 1489d7f93a9a8429f4cabe58c113864e7193f681feb6fc012ed2788d79b9be7f0ced3e12ae3622b30fd7beb122716249e987705f0b981f3f5df8b09e9c909a59
6
+ metadata.gz: d47e10d57c5cedd1f4d4e0518e3d98d4e859fff20a20d92392472065c0cc00e1719a872416a1e39f140a0ef29034d2bf46d3cfab7a6d8f374d961ee78c5c083b
7
+ data.tar.gz: 53f334f1df12747419b47d8e30467b311bf997d2a8ff08d0a7ca71d0feda8b1c2ba0dc824727671fa9f811c27c1e7131c48fb7102109cf892550a9540e944631
@@ -30,8 +30,12 @@ module Effective
30
30
  end
31
31
 
32
32
  # Duplicate if possible
33
- if params[:duplicate_id]
34
- duplicate = resource_scope.find_by_id(params[:duplicate_id])
33
+ if params[:duplicate_id].present?
34
+ duplicate = (resource_scope.find(params[:duplicate_id]) rescue nil)
35
+ duplicate ||= (resource_scope.find_by_id(params[:duplicate_id]) rescue nil)
36
+
37
+ raise ActiveRecord::RecordNotFound unless duplicate.present?
38
+
35
39
  EffectiveResources.authorize!(self, :show, duplicate)
36
40
 
37
41
  self.resource = duplicate_resource(duplicate)
@@ -7,8 +7,8 @@
7
7
  #
8
8
  # class Thing < ApplicationRecord
9
9
  # has_many :comments
10
- # acts_as_archivable cascade: :comments
11
- # acts_as_archivable cascade: :comments, strategy: :archive|:archive_all|:active_job
10
+ # acts_as_archived cascade: :comments
11
+ # acts_as_archived cascade: :comments, strategy: :archive|:archive_all|:active_job
12
12
  # end
13
13
 
14
14
  # Each controller needs its own archive and unarchive action.
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '2.8.3'.freeze
2
+ VERSION = '2.8.5'.freeze
3
3
  end
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.8.3
4
+ version: 2.8.5
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-06-26 00:00:00.000000000 Z
11
+ date: 2023-06-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails