active_scaffold 3.4.34 → 3.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5831aedbc0ccb79952a771522d0a768fdf0162cd
-  data.tar.gz: 49eae4e8f8fa5aaf500b3217fbc9581379904131
+  metadata.gz: 047204c7ed281db3ab039a622cde11ad71d7a7d6
+  data.tar.gz: c60b1312ef3aa2e21edeaaa25ff8d4e432cf3142
 SHA512:
-  metadata.gz: d4a7f15f906733e041f3fdc3fe19f02bd425476735a7513048b425ee830d7617f5ac4ef958a4df30ea9413f85a3d4f72f06a93b4fa8834fc11e04bd39c12921c
-  data.tar.gz: 8d4b52569bad66e17e3f7230d48592175d35ca20e8855e8ec8e29c9a27327c886128ff848e9ba1917f8300389b6661a5364ab523097ea3f7faf8def0cb1c65c9
+  metadata.gz: 13d05fe3a97d1cc2542dc01074ad250f2e2dfe6a4ae56ceb55875360b966254d942463b3286a2b11e911b9bbbe645c741021c11232eaff749886d46152ee410d
+  data.tar.gz: 63e0aa647cf1bdd0f527c201f851dfc349cf6cb8626e752feba3d065cb0ead2a312c5a429c28a72b3df9d8b11af800526b47d231d8b73f934c2c13b34202540d

data/CHANGELOG

@@ -1,3 +1,7 @@
+- Fix JS error on update columns when request fails and form is loaded on page
+- Not raise exception when trying to scroll to missing element
+- Fix error on rails 3.2 caused by a workaround to fix eager load HABTM with scope on rails 4.2
+
 = 3.4.34
 - Fix past, future and range on field search with rails 4, local time was used instead of UTC
 - Ignore search params when params[:id] is set

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

@@ -691,7 +691,7 @@ var ActiveScaffold = {
   },
 
   report_500_response: function(active_scaffold_id, xhr) {
-    var server_error = jQuery(active_scaffold_id).find('td.messages-container p.server-error').first();
+    var server_error = jQuery(active_scaffold_id).find('.messages-container p.server-error').first();
     if (server_error.is(':visible')) {
       ActiveScaffold.highlight(server_error);
     } else {
@@ -724,6 +724,7 @@ var ActiveScaffold = {
     if (typeof checkInViewport == 'undefined') checkInViewport = true;
     if (typeof(element) == 'string') element = '#' + element;
     element = jQuery(element);
+    if (!element.length) return;
     if (checkInViewport && element.visible()) return;
     jQuery(document).scrollTop(element.offset().top);
   },
@@ -989,13 +990,11 @@ var ActiveScaffold = {
         if (ActiveScaffold.last_focus) {
           var item = jQuery(ActiveScaffold.last_focus);
           if (item.closest('body').length == 0 && item.attr('id')) item = jQuery('#' + item.attr('id'));
-          item.focus().select();
+          if (status != 'error') item.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);
         element.trigger('ajax:error', [xhr, status, error]);
       }
     });

data/app/views/active_scaffold_overrides/_base_form.html.erb

@@ -40,6 +40,12 @@ end
   <h4><%= headline -%></h4>
 
   <div id="<%= element_messages_id(:action => form_action) %>" class="messages-container">
+    <% unless xhr %>
+      <p class="error-message message server-error" style="display:none;">
+        <%= as_(:internal_error).html_safe %>
+        <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+      </p>
+    <% end %>
     <%= render :partial => 'form_messages' %>
   </div>
 

data/lib/active_scaffold/actions/list.rb

@@ -74,7 +74,7 @@ module ActiveScaffold::Actions
         end
       sorting = active_scaffold_config.list.user.sorting
       columns_for_joins, columns_for_includes = columns.select { |c| c.includes.present? }.partition do |c|
-        sorting.sorts_on?(c) || (c.plural_association? && c.association.macro == :has_and_belongs_to_many && c.association.scope)
+        sorting.sorts_on?(c) || (c.plural_association? && c.association.macro == :has_and_belongs_to_many && c.association.respond_to?(:scope) && c.association.scope)
       end
       active_scaffold_preload.concat columns_for_includes.map(&:includes).flatten.uniq
       active_scaffold_references.concat columns_for_joins.map(&:includes).flatten.uniq

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 34
+    PATCH = 35
 
     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.34
+  version: 3.4.35
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails 3.2, 4.0, 4.1 and 4.2 versions of ActiveScaffold supporting prototype