cck_forms 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dceaa1bbafb95e971aa01a98f84e506330928e7
-  data.tar.gz: 99ae8648bafac7968f576b8f3e2c822c987691e6
+  metadata.gz: 5885969f4592d28cbe4d4d18cdf8b3cca99dbc50
+  data.tar.gz: e28ae670e596ba61fda2d37fef00f82ce55d0f4e
 SHA512:
-  metadata.gz: 035dc59ed36c8546d3c78ef4a0c9a1d50300943ba7b0c6c71e8afff7d10c1d99430b6580fdc26ebcee6224d241d293871d3b6d0c6bf8bc6c7e5b50a7c44c0de8
-  data.tar.gz: 377da4b610b5d1b961a835786cd6eb4b95aef62326ca5129527fe43e2ee7610415d5dba720d79e36103b53c9b3bc662eeeceb9ee823467063a05276df39bd603
+  metadata.gz: 4d277ea14c0bfa3ab0fb220758845301c62878e8cc96f226b9c4bc2ee3d5a78bc2a8b7016d7ace1da5083b04f0dc24598b38b58db5399e1388aba53ae8e592cc
+  data.tar.gz: c3b13d9108fec8637998616cc8c798dc3e32c7d2af4932a946f4b1bfc5f471d15e22f8e7cfef721b913b7e32996ba2cf15cfa3f3d81802065a0ca5543b0eecfb

data/lib/cck_forms/date_time.rb

@@ -44,9 +44,10 @@ module CckForms::DateTime
   module ClassMethods
     include DateTimeParser
 
-    def default_options_for_date_time_selectors(value)
+    def default_options_for_date_time_selectors(value, options={})
+      value ||= DateTime.current if options[:required]
       date_in_time_zone = value.in_time_zone(Rails.application.config.time_zone) rescue nil
-      [{default: date_in_time_zone, include_blank: false, with_css_classes: true}, {class: 'form-control'}]
+      [{selected: date_in_time_zone, default: date_in_time_zone, include_blank: !options[:required], with_css_classes: true}, {class: 'form-control'}]
     end
 
     def demongoize_value(value, _parameter_type_class=nil)
@@ -57,6 +58,6 @@ module CckForms::DateTime
   include DateTimeParser
 
   def mongoize
-    date_object_from_what_stored_in_database value
+    date_object_from_what_stored_in_database(value) rescue nil
   end
 end

data/lib/cck_forms/parameter_type_class/date.rb

@@ -14,7 +14,7 @@ class CckForms::ParameterTypeClass::Date
   def self.build_date_form(form_builder, options, type = '')
     val =  options[:value].is_a?(Hash) ? options[:value][type] : options[:value]
     val = CckForms::ParameterTypeClass::Time::date_object_from_what_stored_in_database(val)
-    form_element_options, form_element_html = CckForms::ParameterTypeClass::Time::default_options_for_date_time_selectors(val)
+    form_element_options, form_element_html = CckForms::ParameterTypeClass::Time::default_options_for_date_time_selectors(val, options)
     form_element_html.merge!({required: options[:required]})
     ('<div class="form-inline">%s</div>' % form_builder.fields_for(:value) { |datetime_builder| datetime_builder.date_select type, form_element_options, form_element_html}).html_safe
   end

data/lib/cck_forms/parameter_type_class/date_time.rb

@@ -8,7 +8,7 @@ class CckForms::ParameterTypeClass::DateTime
   def build_form(form_builder, options)
     set_value_in_hash options
     value = CckForms::ParameterTypeClass::Time::date_object_from_what_stored_in_database(options[:value])
-    form_element_options, form_element_html = CckForms::ParameterTypeClass::Time.default_options_for_date_time_selectors(value)
+    form_element_options, form_element_html = CckForms::ParameterTypeClass::Time.default_options_for_date_time_selectors(value, options)
     form_element_options.merge!({minute_step: 5})
     form_element_html.merge!({required: options[:required]})
     ('<div class="form-inline">%s</div>' % form_builder.fields_for(:value) { |datetime_builder| datetime_builder.datetime_select '', form_element_options, form_element_html})

data/lib/cck_forms/parameter_type_class/time.rb

@@ -7,7 +7,7 @@ class CckForms::ParameterTypeClass::Time
   # Time SELECT
   def build_form(form_builder, options)
     set_value_in_hash options
-    value = CckForms::ParameterTypeClass::Time::date_object_from_what_stored_in_database(options[:value])
+    value = CckForms::ParameterTypeClass::Time::date_object_from_what_stored_in_database(options[:value], options)
     form_element_options, form_element_html = CckForms::ParameterTypeClass::Time::default_options_for_date_time_selectors(value)
     form_element_options.merge!({ignore_date: true, minute_step: 5})
     form_element_html.merge!({required: options[:required]})

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails