active_scaffold 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8ff5ba84f3dc705d9828e90c74107b5d7956c0
-  data.tar.gz: 83d93e5cfce76fc8b5ffa04a72114e88a39ee6b3
+  metadata.gz: e2ef74ce45fee06f01b9150802312b245e2eb226
+  data.tar.gz: 7be6ae4331a71c54488362305825ca222dc39d05
 SHA512:
-  metadata.gz: 0a1018479c9bab0ef13fbfe281c20a1fec953bb91403c06c69b38a9220b78b7e7d55d39cd28f9fb5bf36ae742e5947034415478ff0fd9157c560fe73cbb2a23e
-  data.tar.gz: d1b55a0ca9c756fd581aaaec5bdff972ad55942f8ea5d326e4e166dff35ea4c0ad4bebed3ff6df85275a7fb4872b1ebc4d7a2c8868b7bfb1954aa42ef7756dfb
+  metadata.gz: 7f30bfe3a5091311f0f03a0a9b74b2fdf92f0237bedd728020c32a818d6eb6fd5acb08c77ecbb948487bab097b79d5c17e7b8928021a72125531f086fd6f7041
+  data.tar.gz: a99a94a0321aaabda253e299d9eec2acc37ea7519db77ce8b1f3e843949b62316983d5523093b636b1dbd490e5b2ec970ba79c5cc6ce773472b3510657da596a

data/CHANGELOG

@@ -1,6 +1,13 @@
+= 3.4.4 (not released yet)
+- Fix set_parent for render field on blank records added by default on subforms
+- Enable sorting on selected draggable list, so it can be used on config_list
+- Remove unfinished nested_auto_open feature, it was working only if render_component is used, which is not recommended way
+- Allow to set sorting on multiple columns with a hash, ruby 1.9 hashes keep order so an array of hashes is not needed anymore, although it still works.
+- Fix overriding default sorting (with config.list.user.sorting.set) without changing config.list.sorting
+
 = 3.4.3
 - default search columns doesn't include association columns (broken on 3.4.2), it slowing down search with no point (searching by association's primary key)
-- More unobtrusive html views
+- More unobtrusive html views, activescaffold html views doesn't use javascript anymore so JS files can be loaded at page bottom
 
 = 3.4.2
 - fix tableless on latest rails4 versions

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

@@ -582,8 +582,7 @@ var ActiveScaffold = {
     if (!skip_loading_indicator && loading_indicator) loading_indicator.css('visibility','visible');
     jQuery('input[type=submit]', as_form).attr('disabled', 'disabled');
     jQuery('.sub-form a.destroy', as_form).addClass('disabled');
-    if (jQuery.fn.draggable) jQuery('.draggable-item', as_form).draggable('disable');
-    if (jQuery.fn.droppable) jQuery('.draggable-list', as_form).droppable('disable');
+    if (jQuery.fn.droppable) jQuery('.draggable-list', as_form).sortable('disable');
     // data-remote-disabled attr instead of set data because is used to in selector later
     jQuery("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled').attr('data-remove-disabled', true);
   },
@@ -595,8 +594,7 @@ var ActiveScaffold = {
     if (!skip_loading_indicator && loading_indicator) loading_indicator.css('visibility','hidden');
     jQuery('input[type=submit]', as_form).removeAttr('disabled');
     jQuery('.sub-form a.destroy.disabled', as_form).removeClass('disabled');
-    if (jQuery.fn.draggable) jQuery('.draggable-item', as_form).draggable('enable');
-    if (jQuery.fn.droppable) jQuery('.draggable-list', as_form).droppable('enable');
+    if (jQuery.fn.droppable) jQuery('.draggable-list', as_form).sortable('enable');
     jQuery("input[data-remove-disabled],select[data-remove-disabled],textarea[data-remove-disabled]", as_form).removeAttr('disabled data-remove-disabled');
   },  
   
@@ -967,7 +965,7 @@ var ActiveScaffold = {
   draggable_lists: function(selector_or_elements, parent) {
     var elements;
     if (!jQuery.fn.draggableLists) return;
-    if (typeof(selector_or_elements) == 'string') elements = jQuery('ul' + selector_or_elements, parent);
+    if (typeof(selector_or_elements) == 'string') elements = jQuery(selector_or_elements, parent);
     else elements = jQuery(selector_or_elements);
     elements.draggableLists();
   }

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

@@ -8,23 +8,18 @@
       var li = jQuery(item).closest('li').addClass('draggable-item');
       li.children('label').removeAttr('for');
       if (jQuery(item).is(':checked')) li.appendTo(list_selected);
-      li.draggable({appendTo: 'body', helper: 'clone'});
     });
-    jQuery([element, list_selected]).droppable({
+    var options = {
       hoverClass: 'hover',
-      accept: function(draggable) {
-        var parent_id = draggable.parent().attr('id'), id = jQuery(this).attr('id'),
-          requested_id = jQuery(this).hasClass('selected') ? id.replace('_selected', '') : id + '_selected';
-        return parent_id == requested_id;
-      },
-      drop: function(event, ui) {
-        jQuery(this).append(ui.draggable);
-        var input = jQuery('input:checkbox', ui.draggable);
+      containment: '',
+      receive: function(event, ui) {
+        var input = jQuery('input:checkbox', ui.item), selected = input.prop('checked');
         input.prop('checked', jQuery(this).hasClass('selected'));
-        input.trigger('change');
-        ui.draggable.css({left: '0px', top: '0px'});
+        if (selected != input.prop('checked')) input.trigger('change');
       }
-    });
+    };
+    jQuery(element).sortable(jQuery.extend(options, {connectWith: '#'+list_selected.attr('id')}));
+    jQuery(list_selected).sortable(jQuery.extend(options, {connectWith: '#'+element.attr('id')}));
     return element;
   };
   jQuery.fn.draggableLists = function() {

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

@@ -803,7 +803,7 @@ var ActiveScaffold = {
   
   draggable_lists: function(selector_or_elements, parent) {
     var elements;
-    if (typeof(selector_or_elements) == 'string') elements = $(parent).select('ul' + selector_or_elements);
+    if (typeof(selector_or_elements) == 'string') elements = $(parent).select(selector_or_elements);
     else elements = $A($(selector_or_elements));
     elements.each(function(item) {
       new DraggableLists(item);

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

@@ -23,7 +23,4 @@ data_refresh ||= record.to_param
       <%= display_action_links(action_links, record, :level_0_tag => :td, :for => record.persisted? ? record : record.class) %>
     </tr>
   </table></td>
-
-  
-  <%= render_nested_view(action_links, record) unless @nested_auto_open.nil? %>
 </tr>

data/lib/active_scaffold/actions/core.rb

@@ -83,7 +83,7 @@ module ActiveScaffold::Actions
           @record.send "#{@column.name}=", value
           @record.id = params[:id]
         end
-        set_parent(@record) if @record.id.nil? && params[:parent_controller] && params[:child_association]
+        set_parent(@record) if @record.id.nil? && params[:parent_controller]
         
         after_render_field(@record, @column)
       end
@@ -91,7 +91,8 @@ module ActiveScaffold::Actions
 
     def set_parent(record)
       parent_model = params[:parent_controller].singularize.camelize.constantize
-      association = parent_model.reflect_on_association(params[:child_association].to_sym).try(:reverse)
+      child_association = params[:child_association].presence || @scope.split(']').first.sub(/^\[/, '')
+      association = parent_model.reflect_on_association(child_association.to_sym).try(:reverse)
       if association
         parent = parent_model.new
         copy_attributes(parent_model.find(params[:parent_id]), parent) if params[:parent_id]

data/lib/active_scaffold/actions/list.rb

@@ -26,7 +26,6 @@ module ActiveScaffold::Actions
       else
         do_refresh_list
       end
-      @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
 

data/lib/active_scaffold/config/list.rb

@@ -152,11 +152,13 @@ module ActiveScaffold::Config
     # the ActionLink to reset search
     attr_reader :reset_link
 
-    # the default sorting. should be an array of hashes of {column_name => direction}, e.g. [{:a => 'desc'}, {:b => 'asc'}]. to just sort on one column, you can simply provide a hash, though, e.g. {:a => 'desc'}.
+    # the default sorting.
+    # should be a hash of {column_name => direction}, e.g. {:a => 'desc', :b => 'asc'}.
+    # for backwards compatibility, it may be an array of hashes of {column_name => direction}, e.g. [{:a => 'desc'}, {:b => 'asc'}].
+    # to just sort on one column, you can simply provide a hash, e.g. {:a => 'desc'}.
     def sorting=(val)
       val = [val] if val.is_a? Hash
-      sorting.clear
-      val.each { |clause| sorting.add *Array(clause).first }
+      sorting.set *val
     end
     def sorting
       @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
@@ -211,12 +213,6 @@ module ActiveScaffold::Config
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
     
-    # might be set to open nested_link automatically in view
-    # conf.nested.add_link(:players)
-    # conf.list.nested_auto_open = {:players => 2}
-    # will open nested players view if there are 2 or less records in parent
-    attr_accessor :nested_auto_open
-    
     # wrap normal cells (not inplace editable columns or with link) with a tag
     # it allows for more css styling
     attr_accessor :wrap_tag
@@ -235,7 +231,7 @@ module ActiveScaffold::Config
       end
       
       attr_writer :label
-      # This label has alread been localized.
+      # This label has already been localized.
       def label
         self['label'] || @label || @conf.label
       end
@@ -262,7 +258,7 @@ module ActiveScaffold::Config
       end
 
       def default_sorting
-        nested_default_sorting.nil? ? @conf.sorting : nested_default_sorting
+        nested_default_sorting.nil? ? @conf.sorting.clone : nested_default_sorting
       end
 
       def user_sorting?
@@ -282,7 +278,6 @@ module ActiveScaffold::Config
           else
             @sorting = default_sorting
             if @conf.columns.constraint_columns.present?
-              @sorting = @sorting.clone
               @sorting.constraint_columns = @conf.columns.constraint_columns
             end
           end

data/lib/active_scaffold/core.rb

@@ -40,10 +40,10 @@ module ActiveScaffold
     # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
     def handle_user_settings
       if self.class.uses_active_scaffold?
+        storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
         active_scaffold_config.actions.each do |action_name|
           conf_instance = active_scaffold_config.send(action_name) rescue next
           next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
-          storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
           conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
         end
       end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -49,9 +49,19 @@ module ActiveScaffold::DataStructures
     end
 
     # clears the sorting before setting to the given column/direction
+    # set(column, direction)
+    # set({column => direction, column => direction})
+    # set({column => direction}, {column => direction})
+    # set([column, direction], [column, direction])
     def set(*args)
       clear
-      add(*args)
+      if args.first.is_a?(Enumerable)
+        args.each do |h|
+          h.is_a?(Hash) ? h.each { |c,d| add(c,d) } : add(*h)
+        end
+      else
+        add(*args)
+      end
     end
 
     # clears the sorting

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -329,18 +329,6 @@ module ActiveScaffold
         column.label
       end
       
-      def render_nested_view(action_links, record)
-        rendered = []
-        action_links.member.each do |link|
-          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view, true)
-            link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, record))
-            link_id = get_action_link_id(link, record)
-            rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
-          end 
-        end
-        rendered.join(' ').html_safe
-      end  
-      
     end
   end
 end

data/lib/active_scaffold/version.rb

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

data/test/config/list_test.rb

@@ -65,11 +65,20 @@ module Config
       assert_equal 'DESC', @config.list.sorting.direction_of(:a)
       refute @config.list.sorting.sorts_on?(:id)
       
+      @config.list.sorting = {:c => :asc, :d => :desc}
+      assert @config.list.sorting.sorts_on?(:c)
+      assert_equal 'ASC', @config.list.sorting.direction_of(:c)
+      assert @config.list.sorting.sorts_on?(:d)
+      assert_equal 'DESC', @config.list.sorting.direction_of(:d)
+      refute @config.list.sorting.sorts_on?(:a)
+      refute @config.list.sorting.sorts_on?(:id)
+      
       @config.list.sorting = [{:a => :asc}, {:b => :desc}]
       assert @config.list.sorting.sorts_on?(:a)
       assert_equal 'ASC', @config.list.sorting.direction_of(:a)
       assert @config.list.sorting.sorts_on?(:b)
       assert_equal 'DESC', @config.list.sorting.direction_of(:b)
+      refute @config.list.sorting.sorts_on?(:c)
       refute @config.list.sorting.sorts_on?(:id)
     end
     

data/test/data_structures/sorting_test.rb

@@ -56,6 +56,20 @@ class SortingTest < MiniTest::Test
     refute @sorting.sorts_on?(:a)
     assert @sorting.sorts_on?(:b)
     assert_equal 'DESC', @sorting.direction_of(:b)
+
+    @sorting.set :a => 'DESC', :b => 'ASC'
+    assert @sorting.instance_variable_get('@clauses').size == 2
+    assert @sorting.sorts_on?(:a)
+    assert_equal 'DESC', @sorting.direction_of(:a)
+    assert @sorting.sorts_on?(:b)
+    assert_equal 'ASC', @sorting.direction_of(:b)
+
+    @sorting.set [:a, 'DESC'], [:b, 'ASC']
+    assert @sorting.instance_variable_get('@clauses').size == 2
+    assert @sorting.sorts_on?(:a)
+    assert_equal 'DESC', @sorting.direction_of(:a)
+    assert @sorting.sorts_on?(:b)
+    assert_equal 'ASC', @sorting.direction_of(:b)
   end
 
   def test_sorts_on

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda