active_scaffold 3.6.14 → 3.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79509054cd67e6f4f1313ed2ee14a1f9eb64306cfbc3e20f5385af23f44edc90
-  data.tar.gz: 2490e6858effd4cb04634f8bebf868318dc807ef01cc3f1b7f9b4b34652f2f9f
+  metadata.gz: 6cc7c6f7e057512476a4f93c0505622a34a97c81b6cbd75c5bb1b014a928ad65
+  data.tar.gz: c9e2bf9f2240b380b1ebd3f52007db921b88a3035aee3327fec779d74c43f0c6
 SHA512:
-  metadata.gz: 5719da364b955e1fce7c1f1e7fc383a4ada1313a69334c6bfddfc1960a1960d5aa05ed6b6054d7eba52390d7b70984930b84dc06162d96ffca01565c15dacbd4
-  data.tar.gz: cc9ed4db3c9c24b741a2fee4ee1f38dfa636ea607190c66b0d2e9fb99685b542bda602093945427defc47c22a24f726503e017ab65c17e03b3b63d093a29e461
+  metadata.gz: 30377a392938156d9ce545bf18fe0cafebabd935fcd913d4ad28836f53a25cbde41bb7849542f08d6acebdcab9d0e39c8efbddc2d0fe10bf4a40c8af4cedf15e
+  data.tar.gz: 19602b41999bf34152f9a968c78aa36529794ca7d5ae17db43c55ae288f34b5ed5409923cd1e62ec7a8f5d97f781dd60cce8307c90291136303c3890e0c543e4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 3.6.15
+- Prevent firing 2 change events on jquery datetime pickers
+- Fix setting data options on columns for date and datetime pickers
+
+= 3.6.14
 - Fix setting data on html_options when threadsafe is enabled
 - Fill nested association on render field, as done in new action
 

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -41,3 +41,12 @@ jQuery(document).on("focus", "input.datetime_picker", function(){
   }
   return true;
 });
+
+jQuery(document).on('change', 'input.datetime_picker', function(e) {
+  var $this = $(this);
+  if ($this.data('first-event')) $this.removeData('first-event');
+  else {
+    $this.data('first-event', true);
+    e.stopImmediatePropagation();
+  }
+});

data/lib/active_scaffold/actions/nested.rb

@@ -118,15 +118,15 @@ module ActiveScaffold::Actions
       @nested_parent_record ||= find_if_allowed(nested.parent_id, crud, nested.parent_model)
     end
 
-    def create_association_with_parent?
+    def create_association_with_parent?(check_match = false)
       # has_many is done by beginning_of_chain and rails if direct association, not in through associations
       return false if nested.has_many? && !nested.association.through?
+      return false if check_match && !nested.match_model?(active_scaffold_config.model)
       nested.child_association && nested_parent_record
     end
 
     def create_association_with_parent(record, check_match = false)
-      return unless create_association_with_parent?
-      return if check_match && !nested.match_model?(active_scaffold_config.model)
+      return unless create_association_with_parent?(check_match)
       if nested.child_association.singular?
         record.send("#{nested.child_association.name}=", nested_parent_record)
       elsif nested.association.through_singular? && nested.child_association.through_singular?

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -160,8 +160,7 @@ module ActiveScaffold::Bridges
           format = datepicker_format(options, column.search_ui)
           options[:class] << " #{column.search_ui}"
           options[:style] = 'display: none' if options[:show] == false # hide only if asked to hide
-          options[:data] ||= {}
-          options[:data].merge! datepicker_format_options(column, format)
+          options[:data] = datepicker_format_options(column, format).reverse_merge!(options[:data] || {})
           value = l(value, :format => format) if value
           options = options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]", :object => nil)
           text_field_tag("#{options[:name]}[#{name}]", value, options)
@@ -176,8 +175,7 @@ module ActiveScaffold::Bridges
 
           format = datepicker_format(options, column.form_ui)
           value = controller.class.condition_value_for_datetime(column, record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
-          options[:data] ||= {}
-          options[:data].merge! datepicker_format_options(column, format)
+          options[:data] = datepicker_format_options(column, format).reverse_merge!(options[:data] || {})
           options[:value] = (value ? l(value, :format => format) : nil)
           text_field(:record, column.name, options)
         end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 14
+    PATCH = 15
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/vendor/assets/javascripts/jquery-ui-timepicker-addon.js

@@ -174,8 +174,8 @@
 
 			for (var attrName in this._defaults) {
 				if (this._defaults.hasOwnProperty(attrName)) {
-					var attrValue = $input.attr('time:' + attrName);
-					if (attrValue) {
+					var attrValue = $input.data(attrName.toLowerCase());
+					if (attrValue !== undefined) {
 						try {
 							inlineSettings[attrName] = eval(attrValue);
 						} catch (err) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.14
+  version: 3.6.15
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails