para 0.11.1 → 0.11.2

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: f8200df9f27fa2f27d322ee3458aca86afe26c70629be160848bb12629586057
4
- data.tar.gz: 6a931b1665e21f17304bc1f918cb32b686796accadd3184532d4b47230414c46
3
+ metadata.gz: 6f6fa00155104b2a8b6557c6ec04c3c64ae456eaeea26605757f0b4fef347fcc
4
+ data.tar.gz: 91243a2554514c1acbffec0d730276ffe5db4063b21723b91f0ed842b9ccb228
5
5
  SHA512:
6
- metadata.gz: 27faad84e404aea146d51ece49a8d5091f1dc3f201a44c16841733c28ecfdc8aab1560f080887216949db150d0c19e1e5ced913cdb2cace01462608b735c77f9
7
- data.tar.gz: 0b11a0c0239a54e99408d15deb17c0ff4174be9719dd0fa592faebce81affa2b69f9e68fd3697160d31db2f8b12fe50c2519e8f622e787cdd5e02c00573425b3
6
+ metadata.gz: 6842f6aa0f5ed769519fe0ce471ea9cb5bde60458974debc956ba094f93eb799dfbb4d0f9d6a0728e2131c3376088ecf7cd904130a228345b9d204664fdf8a7b
7
+ data.tar.gz: 9de0c468a9e29066ca22a2cd0f2d5f600c0d4d7397b63034ab8a9a53784aa255901f1ea95e3f9759103a2a411d3f163c3a3bdb763b6e02e1c76008f90e29c2d3
@@ -1,14 +1,14 @@
1
1
  module Para
2
2
  module Inputs
3
3
  class NestedBaseInput < SimpleForm::Inputs::Base
4
- GLOBAL_NESTED_FIELD_KEY = "para.nested_field.parent"
4
+ GLOBAL_NESTED_FIELD_KEY = 'para.nested_field.parent'
5
5
 
6
6
  private
7
7
 
8
8
  def dom_identifier
9
9
  @dom_identifier ||= begin
10
10
  name = attribute_name
11
- id = @builder.object.id || "_new_#{ parent_nested_field&.attribute_name }_"
11
+ id = @builder.object.id || "_new_#{parent_nested_field&.attribute_name}_"
12
12
  time = (Time.now.to_f * 1000).to_i
13
13
  random = (rand * 1000).to_i
14
14
  [name, id, time, random].join('-')
@@ -22,7 +22,7 @@ module Para
22
22
  def subclasses
23
23
  options.fetch(:subclasses, [])
24
24
  end
25
-
25
+
26
26
  def add_button_label
27
27
  options.fetch(:add_button_label) { I18n.t('para.form.nested.add') }
28
28
  end
@@ -39,13 +39,13 @@ module Para
39
39
  @parent_nested_field = RequestStore.store[GLOBAL_NESTED_FIELD_KEY]
40
40
  RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = self
41
41
 
42
- block.call.tap do
43
- RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = @parent_nested_field
44
- end
42
+ block.call
43
+ ensure
44
+ RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = @parent_nested_field
45
45
  end
46
46
 
47
- def parent_nested_field
48
- @parent_nested_field || RequestStore.store[GLOBAL_NESTED_FIELD_KEY]
47
+ def parent_nested_field(fallback_to_self: true)
48
+ @parent_nested_field || (RequestStore.store[GLOBAL_NESTED_FIELD_KEY] if fallback_to_self)
49
49
  end
50
50
  end
51
51
  end
@@ -4,7 +4,7 @@ module Para
4
4
  attr_reader :resource
5
5
 
6
6
  def input(_wrapper_options = nil)
7
- input_html_options[:class] << "nested-many"
7
+ input_html_options[:class] << 'nested-many'
8
8
 
9
9
  orderable = options.fetch(:orderable, model.orderable?)
10
10
  add_button = options.fetch(:add_button, true)
@@ -40,6 +40,15 @@ module Para
40
40
  end
41
41
  end
42
42
 
43
+ protected
44
+
45
+ def render_partial?
46
+ options[:render_partial] ||
47
+ object.errors.any? ||
48
+ (object.persisted? && uncollapsed?) ||
49
+ parent_nested_field(fallback_to_self: false)&.render_partial?
50
+ end
51
+
43
52
  private
44
53
 
45
54
  def parent_model
@@ -58,10 +67,6 @@ module Para
58
67
  inset? && Para.config.uncollapse_inset_nested_fields
59
68
  end
60
69
 
61
- def render_partial?
62
- options[:render_partial] || object.errors.any? || (object.persisted? && uncollapsed?)
63
- end
64
-
65
70
  def remote_partial_params
66
71
  @remote_partial_params ||= options.fetch(:remote_partial_params, {}).merge(
67
72
  namespace: :nested_form
data/lib/para/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Para
4
- VERSION = '0.11.1'
4
+ VERSION = '0.11.2'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: para
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.1
4
+ version: 0.11.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Valentin Ballestrino
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-01-10 00:00:00.000000000 Z
11
+ date: 2023-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: active_decorator
@@ -862,7 +862,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
862
862
  - !ruby/object:Gem::Version
863
863
  version: '0'
864
864
  requirements: []
865
- rubygems_version: 3.4.2
865
+ rubygems_version: 3.4.4
866
866
  signing_key:
867
867
  specification_version: 4
868
868
  summary: Rails admin engine