effective_resources 2.8.5 → 2.8.7

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: 40f7d69324aa9033e2ae26f51dda5216126ce457aa774cf4910ac46e7fae1c64
4
- data.tar.gz: c451889a8ba4bdf4e3d2ad6f50ccce98c71f7c3e365784ee34d55e69d3edcd09
3
+ metadata.gz: b20557b39c6a58e12d87157ccc21b3ce99ac38e2a57e1c3c45b0a07333d45e05
4
+ data.tar.gz: 2bfc034398f369c999e26f8907c6790d127102d9416b5914e63066b16003d452
5
5
  SHA512:
6
- metadata.gz: d47e10d57c5cedd1f4d4e0518e3d98d4e859fff20a20d92392472065c0cc00e1719a872416a1e39f140a0ef29034d2bf46d3cfab7a6d8f374d961ee78c5c083b
7
- data.tar.gz: 53f334f1df12747419b47d8e30467b311bf997d2a8ff08d0a7ca71d0feda8b1c2ba0dc824727671fa9f811c27c1e7131c48fb7102109cf892550a9540e944631
6
+ metadata.gz: d2e218f0580ab6d3a5f7a2f7bfaf5d2d27967f1670628dbb8580d6e4d44717c80904ac4bbb33c15f1da079420e5a3518cfb0a1dc8ce00bd5c58d49396941bf43
7
+ data.tar.gz: d2e2f6fd1cd3ca5a6de6b6c6e3ed306d10a1615b1b9abdc534d4510fa91612a79eb947ff08cc4746b57162ebc1e5d586adf4dc385a8f773b63878b6d59442235
@@ -19,9 +19,16 @@ module Effective
19
19
 
20
20
  self.resource ||= resource_scope.new
21
21
 
22
+ # Assign attributes from the query string
22
23
  to_assign = if view_context.respond_to?(:inline_datatable?) && view_context.inline_datatable?
23
24
  EffectiveDatatables.find(params[:_datatable_id], params[:_datatable_attributes]).attributes
24
- elsif params.present?
25
+ end
26
+
27
+ to_assign ||= if params[resource_name].present? && params[resource_name].respond_to?(:to_unsafe_h)
28
+ params[resource_name].to_unsafe_h
29
+ end
30
+
31
+ to_assign ||= if params.present?
25
32
  params.to_unsafe_h.except(:controller, :action, :id, :duplicate_id)
26
33
  end
27
34
 
@@ -31,10 +38,7 @@ module Effective
31
38
 
32
39
  # Duplicate if possible
33
40
  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?
41
+ duplicate = resource_scope.find(params[:duplicate_id])
38
42
 
39
43
  EffectiveResources.authorize!(self, :show, duplicate)
40
44
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '2.8.5'.freeze
2
+ VERSION = '2.8.7'.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.5
4
+ version: 2.8.7
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-27 00:00:00.000000000 Z
11
+ date: 2023-07-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails