active_scaffold 3.3.1 → 3.3.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 3.3.2
+- Fix subforms inside subforms
+- Fix draggable for jquery-rails 3 gem
+- Support to change attributes in list column headings with column_heading_attributes helper
+- Keep url for embedded in data-refresh attr of active-scaffold-component div
+- Remove duplicated results when searching with outer_joins in plural associations
+
 = 3.3.1
 - Set adapter colspan (nested lists and forms) using javascript, fixed issue when active_scaffold_config_list is used
 - Fix bug saving default values when get method is overrided on model to return default value

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

@@ -7,6 +7,8 @@
 <% elsif Jquery.const_defined? 'Ui' %>
 <% require_asset "jquery.ui.core" %>
 <% require_asset "jquery.ui.sortable" %>
+<% require_asset "jquery.ui.draggable" %>
+<% require_asset "jquery.ui.droppable" %>
 <% require_asset "jquery.ui.datepicker" %>
 <% require_asset "jquery-ui-timepicker-addon" %>
 <% end %>

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -69,8 +69,8 @@ module ActionView::Helpers #:nodoc:
         if controller.respond_to?(:render_component_into_view, true)
           controller.send(:render_component_into_view, url_options)
         else
-          content_tag(:div, :id => id, :class => 'active-scaffold-component') do
-            url = url_for(url_options)
+          url = url_for(url_options)
+          content_tag(:div, :id => id, :class => 'active-scaffold-component', :data => {:refresh => url}) do
             # parse the ActiveRecord model name from the controller path, which
             # might be a namespaced controller (e.g., 'admin/admins')
             model = remote_controller.to_s.sub(/.*\//, '').singularize

data/lib/active_scaffold/finder.rb

@@ -344,7 +344,7 @@ module ActiveScaffold
       
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       count_query = append_to_query(beginning_of_chain, options)
-      count = count_query.count
+      count = count_query.count(:distinct => true)
   
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when find_options contains a :group key
@@ -367,6 +367,7 @@ module ActiveScaffold
       end
 
       klass = beginning_of_chain
+      klass = klass.uniq if find_options[:outer_joins].present?
       # we build the paginator differently for method- and sql-based sorting
       if options[:sorting] and options[:sorting].sorts_by_method?
         pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -415,7 +415,7 @@ module ActiveScaffold
       def column_scope(column, scope = nil, record = nil)
         Rails.logger.warn "Relying on @record is deprecated, call column_scope with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
         if column.plural_association?
-          "#{scope}[#{column.name}][#{record.id || generate_temporary_id}]"
+          "#{scope}[#{column.name}][#{record.id || generate_temporary_id(record)}]"
         else
           "#{scope}[#{column.name}]"
         end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -279,8 +279,12 @@ module ActiveScaffold
         content_tag(:span, check_box_tag("#{controller_id}_mark_heading_span_input", '1', all_marked?), tag_options)
       end
 
-      def render_column_heading(column, sorting, sort_direction)
+      def column_heading_attributes(column, sorting, sort_direction)
         tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => strip_tags(column.description)}
+      end
+
+      def render_column_heading(column, sorting, sort_direction)
+        tag_options = column_heading_attributes(column, sorting, sort_direction)
         if column.name == :as_marked
           tag_options[:data] = {
             :ie_mode => :inline_checkbox,

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 3
-  - 1
-  version: 3.3.1
+  - 2
+  version: 3.3.2
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-24 00:00:00 Z
+date: 2013-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development