fixed v model type for checkboxes

Author: jonasjabari

lib/matestack/ui/vue_js/components/form/base.rb

@@ -87,9 +87,22 @@ def input_key
               "$parent.data['#{key}']"
             end
 
-            # set v-model.number for all numeric init values
-            def v_model_type
-              (type == :number || init_value.is_a?(Numeric)) ? 'v-model.number' : 'v-model'
+            # set v-model.number for all numeric init values or options
+            def v_model_type(item=nil)
+              if item.nil?
+                (type == :number || init_value.is_a?(Numeric)) ? 'v-model.number' : 'v-model'
+              else
+                item.is_a?(Integer) ? 'v-model.number' : 'v-model'
+              end
+            end
+          
+            # set value-type "Integer" for all numeric init values or options
+            def value_type(item=nil)
+              if item.nil?
+                (type == :number || init_value.is_a?(Numeric)) ? Integer : nil
+              else
+                item.is_a?(Integer)? Integer : nil
+              end
             end
 
             # error rendering

lib/matestack/ui/vue_js/components/form/checkbox.rb

@@ -51,8 +51,8 @@ def checkbox_attributes(item)
                 '@change': change_event,
                 'init-value': (init_value || []).to_json,
                 'v-bind:class': "{ '#{error_class}': #{error_key} }",
-                'value-type': item_value(checkbox_options.first).is_a?(Integer) ? Integer : nil,
-                "#{v_model_type}": input_key,
+                'value-type': value_type(item),
+                "#{v_model_type(item)}": input_key,
               }.merge(self.options)
             end
 

lib/matestack/ui/vue_js/components/form/radio.rb

@@ -38,7 +38,7 @@ def radio_attributes(item)
                 value: item_value(item),
                 type: :radio,
                 ref: "select.#{key}",
-                'value-type': item_value(radio_options.first).is_a?(Integer) ? Integer : nil,
+                'value-type': value_type(item_value(radio_options.first))
               })
             end
 

lib/matestack/ui/vue_js/components/form/select.rb

@@ -41,7 +41,7 @@ def select_attributes
                 multiple: multiple,
                 id: id,
                 ref: "select#{'.multiple' if multiple}.#{key}",
-                'value-type': item_value(select_options.first).is_a?(Integer) ? Integer : nil,
+                'value-type': value_type(select_options.first),
                 'init-value': init_value,
               })
             end