active_scaffold 3.4.18.1 → 3.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58ec888b57c63fb8dd41136f932245475c26b91d
-  data.tar.gz: 1020b2766c836faffa21eea4a8701ebb1977f17c
+  metadata.gz: 4522a06a683825a65e9660092377e48da966cf7b
+  data.tar.gz: 0b81519fc84c1b1e9cc41de416d91a80d25fcdb9
 SHA512:
-  metadata.gz: 06a1e78b2f5e9e2b7000e6bf612cb4e7dd9a82370d9531488182f5bbe925b0f9e38f3bd0ef38eb5962a94b9e522ba6c834a25931c214382305835af2522bd355
-  data.tar.gz: d963a86e6807408b8725e487eda1ff98ad8487e74ad1c25da43fc089f2318600d727377ee2f8b63591d89afe3fd365cd4faf1f94b3905f684f3803a6595b2b80
+  metadata.gz: 72fbd86f4e970a0956747ffbda27cf02dd7c3ef75733e4e88af919b6753339f192f3343e158b21ddab2d9c9e12c9951e95a3a18c6a74063658521a04f2630637
+  data.tar.gz: 39c90ee5898d11f75d8e587138a641de6edc9048776f243d535fc10b4508ce06395d5e8616060938384d153c40ca81d04330cc2880251af1623ef9695fb43de5

data/CHANGELOG

@@ -1,3 +1,9 @@
+- Fix rails bug on set_inverse_instance for has_one :through associations which has_many inverse association
+- Fix warn when form is changed
+
+= 3.4.18.1
+- Fix do_destroy for mark action
+
 = 3.4.18
 - Fix paper_trail bridge on development
 - Allow to set :data hash in :html_options for action links
@@ -7,7 +13,7 @@
 - allow to load nested scaffold with nested through associations, even with inplace edit enabled
 - disable create on nested through associations
 - Allow to config live_search delay with ActiveScaffold.js_config
-- Warn when form is changed (ignores search forms), this featured must be enabled with ActiveScaffold.js_config[:warn_changes]
+- Warn when form is changed (ignores search forms), this featured must be enabled with ActiveScaffold.js_config[:warn_changes], message can be set on <meta name="unload-message" content="..."> tag or ActiveScaffold.js_config[:unload_message]
 
 = 3.4.17
 - Fix deprecation warning "Extra .css in SCSS file is unnecessary"

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

@@ -296,7 +296,7 @@ jQuery(document).ready(function($) {
   ActiveScaffold.live_search(document);
   ActiveScaffold.auto_paginate(document);
   ActiveScaffold.draggable_lists('.draggable-lists', document);
-  if (ActiveScaffold.warn_changes) ActiveScaffold.setup_warn_changes();
+  if (ActiveScaffold.config.warn_changes) ActiveScaffold.setup_warn_changes();
   jQuery(document).on('as:element_updated', function(e) {
     ActiveScaffold.load_embedded(e.target);
     ActiveScaffold.enable_js_form_buttons(e.target);
@@ -987,7 +987,7 @@ var ActiveScaffold = {
 
   setup_warn_changes: function() {
     var need_confirm = false;
-    var unload_message = $('meta[name=unload-message]').val() || ActiveScaffold.config.unload_message || "Are you sure you want to navigate away? Any unsaved data will be lost.";
+    var unload_message = $('meta[name=unload-message]').attr('content') || ActiveScaffold.config.unload_message || "This page contains unsaved data that will be lost if you leave this page.";
     $(document).on('change input', '.active-scaffold form:not(.search) input, .active-scaffold form:not(.search) textarea, .active-scaffold form:not(.search) select', function() {
       $(this).closest('form').addClass('need-confirm');
     });

data/lib/active_scaffold/extensions/reverse_associations.rb

@@ -98,8 +98,18 @@ module ActiveScaffold
         reverse_matches
       end
     end
+
+    module ThroughAssociation
+      # NOTE - for now, we're only supporting inverse setting back onto has_one associations.
+      # TODO remove when rails fixes this and old versions are not supported
+      def invertible_for?(record)
+        inverse = super
+        inverse && !inverse.collection?
+      end
+    end
   end
 end
 
 ActiveRecord::Reflection::AssociationReflection.send :include, ActiveScaffold::ReverseAssociation::AssociationReflection
 ActiveRecord::Reflection::ThroughReflection.send :include, ActiveScaffold::ReverseAssociation::ThroughReflection
+ActiveRecord::Associations::ThroughAssociation.send :include, ActiveScaffold::ReverseAssociation::ThroughAssociation

data/lib/active_scaffold/version.rb

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

data/test/mock_app/config/application.rb

@@ -8,6 +8,6 @@ module RailsApp
   class Application < Rails::Application
     config.filter_parameters << :password
     config.action_mailer.default_url_options = {:host => 'localhost:3000'}
-    I18n.enforce_available_locales = false
+    config.i18n.enforce_available_locales = false if config.i18n.respond_to? :enforce_available_locales
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.18.1
+  version: 3.4.19
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman