tramway-core 1.17.6.1 → 1.17.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:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9eefb734f64738208d5ebff801e31274167b6a7332001243b24e0612435e2b16
|
|
4
|
+
data.tar.gz: 2d26b33208ea81fb18c347d96e7dc7aecf95e4786121dbc9c834dc4e4f17309f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bac5a81a3324c4ce8de46df25a375aceaf7b80acbc1a3cc6f56752db1c8d8fb6c464c268b3c7160e13a24eb116d9ca4a93f1a0ae38f71de344e95152ca69131a
|
|
7
|
+
data.tar.gz: 8c1b83417ffdcbcd7c3ed79d5d2312d00357d5d48fe26ef4a351168ac0577f9dd3989df440c15707dad688c67204fd6bc7f5f9bac029fe1d96d04ad5da4a6a19
|
|
@@ -62,19 +62,28 @@ module Tramway::Core::InputsHelper
|
|
|
62
62
|
}.merge options
|
|
63
63
|
end
|
|
64
64
|
|
|
65
|
-
def
|
|
66
|
-
{
|
|
65
|
+
def simple_params(**options)
|
|
66
|
+
builded_options = {
|
|
67
67
|
as: options[:type],
|
|
68
68
|
label: false,
|
|
69
69
|
input_html: {
|
|
70
70
|
name: "#{options[:object]}[#{options[:property]}]",
|
|
71
71
|
id: "#{options[:object]}_#{options[:property]}",
|
|
72
|
-
value:
|
|
72
|
+
value: build_simple_value(
|
|
73
|
+
*options.values_at(:form_object, :property, :value),
|
|
74
|
+
options.dig(:options, :input_html, :value)
|
|
75
|
+
)
|
|
73
76
|
}
|
|
74
|
-
}
|
|
77
|
+
}
|
|
78
|
+
if options[:options].present?
|
|
79
|
+
options[:options].dig(:input_html)&.delete(:value)
|
|
80
|
+
builded_options.merge!(options) || {}
|
|
81
|
+
end
|
|
82
|
+
builded_options
|
|
75
83
|
end
|
|
76
84
|
|
|
77
|
-
def
|
|
78
|
-
|
|
85
|
+
def build_simple_value(form_object, property, value, input_html_value)
|
|
86
|
+
value_to_add = input_html_value ? input_html_value : value
|
|
87
|
+
value_to_add || form_object.send(property)
|
|
79
88
|
end
|
|
80
89
|
end
|
|
@@ -6,7 +6,8 @@
|
|
|
6
6
|
- type = type[:type]
|
|
7
7
|
- if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
|
|
8
8
|
- type = type.to_sym
|
|
9
|
-
|
|
9
|
+
- unless type == :hidden
|
|
10
|
+
= form.label form_object.model.class.human_attribute_name property
|
|
10
11
|
- case type
|
|
11
12
|
- when :default
|
|
12
13
|
= form.input property, **default_params(**input_params)
|
|
@@ -15,7 +16,7 @@
|
|
|
15
16
|
- when :polymorphic_association
|
|
16
17
|
= form.input property, **polymorphic_association_params(**input_params.merge(value: value))
|
|
17
18
|
- else
|
|
18
|
-
= form.input property, **
|
|
19
|
+
= form.input property, **simple_params(**input_params.merge(type: type))
|
|
19
20
|
- else
|
|
20
21
|
- property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
|
|
21
22
|
= render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form
|
data/lib/tramway/core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tramway-core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.17.
|
|
4
|
+
version: 1.17.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Pavel Kalashnikov
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2020-04-
|
|
12
|
+
date: 2020-04-08 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: audited
|