tramway-core 1.17.7 → 1.17.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eefb734f64738208d5ebff801e31274167b6a7332001243b24e0612435e2b16
-  data.tar.gz: 2d26b33208ea81fb18c347d96e7dc7aecf95e4786121dbc9c834dc4e4f17309f
+  metadata.gz: ace598a77cdbc2c4227978563ee8e51f86751e38114e19322e1a4dae06185d41
+  data.tar.gz: a5f1e7e9a031f55a34427ac989dd81d504c71c7835c6c729c3871e5b6d49e829
 SHA512:
-  metadata.gz: bac5a81a3324c4ce8de46df25a375aceaf7b80acbc1a3cc6f56752db1c8d8fb6c464c268b3c7160e13a24eb116d9ca4a93f1a0ae38f71de344e95152ca69131a
-  data.tar.gz: 8c1b83417ffdcbcd7c3ed79d5d2312d00357d5d48fe26ef4a351168ac0577f9dd3989df440c15707dad688c67204fd6bc7f5f9bac029fe1d96d04ad5da4a6a19
+  metadata.gz: 7bd0649874a75ba26c56c6babf43ac53599feeee708f07b16259cdfe4b69f51a2537669ec01749457d9df8ab77646c57c0da6902197bcc01899efead8cf89ca5
+  data.tar.gz: bd713b69cabb604ad37404bb73daf1f046cf13833ff4e2442fc0ba34c570695fc169da7074380bb972cc5026e52d7f21d7a0289b2df5bf1bfe4be6116807209e

data/app/helpers/tramway/core/inputs_helper.rb

@@ -19,9 +19,9 @@ module Tramway::Core::InputsHelper
                            options: options.merge(
                              as: :select,
                              label_method: ->(obj) { "#{obj.class.model_name.human} | #{obj.name}" },
-                             value_method: lambda do |obj|
+                             value_method: lambda { |obj|
                                "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"
-                             end
+                             }
                            )
   end
 
@@ -63,27 +63,28 @@ module Tramway::Core::InputsHelper
   end
 
   def simple_params(**options)
-    builded_options = {
-      as: options[:type],
-      label: false,
-      input_html: {
-        name: "#{options[:object]}[#{options[:property]}]",
-        id: "#{options[:object]}_#{options[:property]}",
-        value: build_simple_value(
-          *options.values_at(:form_object, :property, :value),
-          options.dig(:options, :input_html, :value)
-        )
-      }
-    }
+    builded_options = { as: options[:type], label: false,
+                        input_html: {
+                          name: "#{options[:object]}[#{options[:property]}]",
+                          id: "#{options[:object]}_#{options[:property]}",
+                          value: build_simple_value(
+                            *options.values_at(:form_object, :property, :value),
+                            options.dig(:options, :input_html, :value)
+                          )
+                        } }
+    merge_with_user_options builded_options, options
+  end
+
+  def build_simple_value(form_object, property, value, input_html_value)
+    value_to_add = input_html_value || value
+    value_to_add || form_object.send(property)
+  end
+
+  def merge_with_user_options(builded_options, options)
     if options[:options].present?
       options[:options].dig(:input_html)&.delete(:value)
       builded_options.merge!(options) || {}
     end
     builded_options
   end
-
-  def build_simple_value(form_object, property, value, input_html_value)
-    value_to_add = input_html_value ? input_html_value : value
-    value_to_add || form_object.send(property)
-  end
 end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.7'
+    VERSION = '1.17.7.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.7
+  version: 1.17.7.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited