active_scaffold 3.6.13 → 3.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15e01c11227052618d2b92ad709cfa1197de5ce2d088fb1f5d808f831714ae3
-  data.tar.gz: 64dcb127193bf37114da0d406d514f3091cca7b6295841134a0d9d939c5344f9
+  metadata.gz: 6cc7c6f7e057512476a4f93c0505622a34a97c81b6cbd75c5bb1b014a928ad65
+  data.tar.gz: c9e2bf9f2240b380b1ebd3f52007db921b88a3035aee3327fec779d74c43f0c6
 SHA512:
-  metadata.gz: 86fc673e0a500a8b7734ddb8cde6ebf309f22f6781f60df385e1a715d2218fb120bc2e54ce0fd4befd0ee94093d5e0c6ada201258240f98212eb7f492e68342d
-  data.tar.gz: 9be0d09ab6ad138c3e27ba3d2dba898ad7d72e53005cc1dbab56c4655ce9499dd2aea6afb9450493248ab450be7209fd1d8d9e5bda67f529a70ec42989c90cef
+  metadata.gz: 30377a392938156d9ce545bf18fe0cafebabd935fcd913d4ad28836f53a25cbde41bb7849542f08d6acebdcab9d0e39c8efbddc2d0fe10bf4a40c8af4cedf15e
+  data.tar.gz: 19602b41999bf34152f9a968c78aa36529794ca7d5ae17db43c55ae288f34b5ed5409923cd1e62ec7a8f5d97f781dd60cce8307c90291136303c3890e0c543e4

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+= 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
+
 = 3.6.13
 - Fix link caching on action when threadsafe is enabled
 

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/core.rb

@@ -92,12 +92,14 @@ module ActiveScaffold::Actions
       record = new_model
       copy_attributes(saved_record, record) if saved_record
       apply_constraints_to_record(record) unless scope
+      create_association_with_parent record, true if nested?
       update_record_from_params(record, columns, attributes || {}, true)
     end
 
     def updated_record_with_column(column, value, scope)
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
+      create_association_with_parent record, true if nested?
       value = column_value_from_param_value(record, column, value)
       record.send "#{column.name}=", value
       record.id = params[:id]

data/lib/active_scaffold/actions/nested.rb

@@ -118,14 +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)
-      return unless create_association_with_parent?
+    def create_association_with_parent(record, check_match = false)
+      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/actions/subform.rb

@@ -13,9 +13,7 @@ module ActiveScaffold::Actions
       parent_record = new_model
       # don't apply if scope, subform inside subform, because constraints won't apply to parent_record
       apply_constraints_to_record parent_record unless @scope
-      if nested? && nested.match_model?(active_scaffold_config.model)
-        create_association_with_parent parent_record
-      end
+      create_association_with_parent parent_record, true if nested?
       parent_record
     end
 

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/helpers/action_link_helpers.rb

@@ -335,6 +335,7 @@ module ActiveScaffold
         html_options[:method] = link.method if link.method != :get
 
         html_options[:data] ||= {}
+        html_options[:data] = html_options[:data].deep_dup if html_options[:data].frozen?
         html_options[:data][:confirm] = link.confirm(h(record&.to_label)) if link.confirm?
         if !options[:page] && !options[:popup] && (options[:inline] || link.inline?)
           html_options[:class] << ' as_action'

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 13
+    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.13
+  version: 3.6.15
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails