tramway-core 1.17.6.1 → 1.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d406acc40d7905296b2257e659b8f5135d8b3caeb3accb877e092a3e1d4b43d6
-  data.tar.gz: 3b08362b8b0e3ab614df712ff887c59202e002ae7d894c6712d5007b4b10bbb2
+  metadata.gz: 9eefb734f64738208d5ebff801e31274167b6a7332001243b24e0612435e2b16
+  data.tar.gz: 2d26b33208ea81fb18c347d96e7dc7aecf95e4786121dbc9c834dc4e4f17309f
 SHA512:
-  metadata.gz: c680f805536cb1b02f53d8919ef685b3d4d591d2bc68d2679021b72d96fba9c1ffdb9926dc9c108874d73ed5b1de0eb72161d6b7caf5f9972d83dc1a0bb5b5e6
-  data.tar.gz: 51b5f3715c11f83bed392d62f678ed60262cc848d0f4e34941c2693071ffe150821a293cf653195407565aeaf291b844d9086d27771b92a61c77d265e939b261
+  metadata.gz: bac5a81a3324c4ce8de46df25a375aceaf7b80acbc1a3cc6f56752db1c8d8fb6c464c268b3c7160e13a24eb116d9ca4a93f1a0ae38f71de344e95152ca69131a
+  data.tar.gz: 8c1b83417ffdcbcd7c3ed79d5d2312d00357d5d48fe26ef4a351168ac0577f9dd3989df440c15707dad688c67204fd6bc7f5f9bac029fe1d96d04ad5da4a6a19

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

@@ -62,19 +62,28 @@ module Tramway::Core::InputsHelper
     }.merge options
   end
 
-  def else_params(**options)
-    {
+  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_else_value(options[:form_object], options[:property], options[:value])
+        value: build_simple_value(
+          *options.values_at(:form_object, :property, :value),
+          options.dig(:options, :input_html, :value)
+        )
       }
-    }.merge options[:options] || {}
+    }
+    if options[:options].present?
+      options[:options].dig(:input_html)&.delete(:value)
+      builded_options.merge!(options) || {}
+    end
+    builded_options
   end
 
-  def build_else_value(form_object, property, value)
-    form_object.send(property) ? form_object.model.send(property) : value
+  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/app/views/tramway/core/shared/_input.html.haml

@@ -6,7 +6,8 @@
   - type = type[:type]
 - if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
   - type = type.to_sym
-  = form.label form_object.model.class.human_attribute_name property
+  - unless type == :hidden
+    = form.label form_object.model.class.human_attribute_name property
   - case type
   - when :default
     = form.input property, **default_params(**input_params)
@@ -15,7 +16,7 @@
   - when :polymorphic_association
     = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
   - else
-    = form.input property, **else_params(**input_params.merge(type: type))
+    = form.input property, **simple_params(**input_params.merge(type: type))
 - else
   - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
   = 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

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

metadata

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