active_scaffold 3.4.7 → 3.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac10aec1fac3d66afecec71c2262dedb311c000c
-  data.tar.gz: 77208c9dbc9f3c50b8bd88265ba645be6fe6e857
+  metadata.gz: b5de5babbd2447c2a706b2627e7e1cb09966e563
+  data.tar.gz: 371b743005cc81c284a673ee82e9fd23048bf8e3
 SHA512:
-  metadata.gz: 8cd83d6362143864a3cf2c753163562821da1c32ebb641f0b0e25e49459b3bbee91c415db5f1a256b13a8a06a1d774361c0233bdffd1902ae0f9417b9e004b62
-  data.tar.gz: da1a7da25ad88b2d88ce8811e5d6d4b830c2991a673bc90412f68b30244e4141a51b2119cf0415a11daa8a2f99ad99166f3d7845921e671d6ed0ac37653a5c0d
+  metadata.gz: 1c3156bc03652f0b4efdfe075dd5019648ada5087474e17d49c6fdfd0bdf0e4dc1465eec783638154f22dcaa62d98eb9eeb54ce3b01b6ec04b732931bf495237
+  data.tar.gz: 797149d0738f3e7f995bd13e367fb589e8fa9956d1954b65b90b3e15925631a763ac630227df4ffb6c5c8ebbeb6b466571874601c841eee4506dd3868abc70b5

data/CHANGELOG

@@ -1,4 +1,8 @@
-= 3.4.7 (not released yet)
+= 3.4.8 (not released yet)
+- set parent data when adding new record on subform of a create form on a embedded or nested list
+- trigger ajax:* events on ajax call to render_field
+
+= 3.4.7
 - sorting by primary key added by default only for postgres, on mysql it will avoid using index to sort (you can see using filesort on explain), slowdown sorting
 - fix set_parent on rails 3.2 with attr_accessible
 - fix saving changes on render_field when blank row is changed and request render_field action

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -944,20 +944,29 @@ var ActiveScaffold = {
       url: url,
       data: params,
       type: 'post',
-      beforeSend: function(event) {
+      beforeSend: function(xhr, settings) {
         element.nextAll('img.loading-indicator').css('visibility','visible');
         ActiveScaffold.disable_form(as_form);
+        if ($.rails.fire(element, 'ajax:beforeSend', [xhr, settings])) {
+          element.trigger('ajax:send', xhr);
+        } else {
+          return false;
+        }
+      },
+      success: function(data, status, xhr) {
+        as_form.find('#'+element.attr('id')).trigger('ajax:success', [data, status, xhr]);
       },
-      complete: function(event) {
+      complete: function(xhr, status) {
+        element = as_form.find('#'+element.attr('id'));
         element.nextAll('img.loading-indicator').css('visibility','hidden');
-        ActiveScaffold.enable_form(as_form);
+        element.trigger('ajax:complete', [xhr, status]);
         if (ActiveScaffold.last_focus) jQuery(ActiveScaffold.last_focus).focus().select();
       },
       error: function (xhr, status, error) {
+        element = as_form.find('#'+element.attr('id'));
         var as_div = element.closest("div.active-scaffold");
-        if (as_div) {
-          ActiveScaffold.report_500_response(as_div, xhr);
-        }
+        if (as_div) ActiveScaffold.report_500_response(as_div, xhr);
+        element.trigger('ajax:error', [xhr, status, error]);
       }
     });
   },

data/lib/active_scaffold/actions/subform.rb

@@ -9,6 +9,11 @@ module ActiveScaffold::Actions
 
     def do_edit_associated
       @parent_record = params[:id].nil? ? new_model : find_if_allowed(params[:id], :update)
+      if @parent_record.new_record?
+        apply_constraints_to_record @parent_record
+        create_association_with_parent @parent_record if nested?
+      end
+
       generate_temporary_id(@parent_record, params[:generated_id]) if @parent_record.new_record? && params[:generated_id]
       @column = active_scaffold_config.columns[params[:child_association]]
 

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.8
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda