active_scaffold_config_list 3.2.9 → 3.3.0

data/README

@@ -1,4 +1,5 @@
-This works with Rails 3.2 and ActiveScaffold >= 3.3
+This works with Rails 3.2 and ActiveScaffold >= 3.4.4
+Version 3.2.x worked with Rails 3.2 and ActiveScaffold >= 3.3.0
 
 Usage:
 active_scaffold :model do |conf|
@@ -23,4 +24,4 @@ class User < ActiveRecord::Base
   end
 end
 
-The model storing list configuration must have a config_list attribute storing the config list.
+The model storing list configuration must have a config_list text column storing the config list, and config_list_sort serialized text column.

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

@@ -7,11 +7,10 @@ options = {:id => element_form_id(:action => :config_list),
            'data-loading' => true}
 form_tag url_options, options %>
   <h4><%= active_scaffold_config.config_list.label -%></h4>
-  <%= render :partial => 'show_config_list_form_body', :locals => { :columns => active_scaffold_config.config_list } %>
+  <%= render :partial => 'show_config_list_form_body' %>
   <p class="form-footer">
     <%= submit_tag as_(:config_list), :class => "submit" %>
     <%= link_to as_(:reset), url_for(url_options.merge(:config_list => '')), :class => 'as_cancel', :remote => true, :data => {:refresh => true} %>
     <%= loading_indicator_tag(:action => :config_list) %>
   </p>
 </form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => :config_list)}');") %>

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

@@ -1,14 +1,33 @@
-<ol id="<%= config_list_ol_id %>" class="form sortable-container">
-<%  hidden_columns =  if !config_list_params.nil? && config_list_params.is_a?(Array)
-      config_list = config_list_params
-      active_scaffold_config.list.columns.collect_visible.select{|column| config_list.exclude? column.name}
-    else
-      []
-    end %>
-<% list_columns.concat(hidden_columns).each do |c| %>
-  <li class="form-element sortable">
-    <%= check_box_tag 'config_list[]', c.name.to_s, (config_list_params.nil? ? true : config_list_params.include?(c.name)), {:id => nil}%>
-    <label for="update_table_from"><%= c.label%></label>
+<ol class="form">
+  <li class="form-element">
+    <dl><dt><label>Columns</label></dt>
+    <dd><ul class="<%= active_scaffold_config.config_list.draggable ? 'draggable-lists' : 'sortable-container' %>" id="<%= element_form_id(:action => :config_list) %>-columns">
+<%
+  if !config_list_params.nil? && config_list_params.is_a?(Array)
+    config_list = config_list_params
+    list_columns.concat active_scaffold_config.list.columns.collect_visible.select{|column| config_list.exclude? column.name}
+  end
+%>
+<% list_columns.each do |c| %>
+      <li class="sortable">
+        <%= check_box_tag 'config_list[]', c.name.to_s, (config_list_params.nil? ? true : config_list_params.include?(c.name)), {:id => nil}%>
+        <label><%= c.label%></label>
+      </li>
+<% end %>
+    </ul></dd></dl>
   </li>
+  <li class="form-element">
+    <dl><dt><label>Default Sorting</label></dt>
+    <dd><ol>
+<%
+  columns_options = list_columns.select{|c| c.sortable?}.map{|c| [c.label, c.name]}
+  order_options = ['asc', 'desc']
+  selected = config_list_sorting || []
+  3.times do |i|
+%>
+      <li><%= select_tag "config_list_sorting[#{i}][]", options_for_select(columns_options, :selected => selected[i].try(:first)), :include_blank => as_(:_select_), :class => 'column' %>
+      <%= select_tag "config_list_sorting[#{i}][]", options_for_select(order_options, :selected => selected[i].try(:last)), :include_blank => as_(:_select_), :class => 'order' %></li>
 <% end %>
+    </ol></dd></dl>
+  </li>
 </ol>

data/lib/active_scaffold/actions/config_list.rb

@@ -2,8 +2,8 @@ module ActiveScaffold::Actions
   module ConfigList
     
     def self.included(base)
-      base.before_filter :store_config_list_params, :only => [:index]
-      base.helper_method :config_list_params
+      base.before_filter :store_config_list_params, :set_default_sorting, :only => [:index]
+      base.helper_method :config_list_params, :config_list_sorting
       base.extend ClassMethods
     end
 
@@ -29,6 +29,12 @@ module ActiveScaffold::Actions
     end
     
     protected
+    
+    def set_default_sorting
+      unless active_scaffold_config.list.user['sort'] || (params['sort'] and params['sort_direction'])
+        active_scaffold_config.list.user.sorting.set *config_list_sorting if config_list_sorting
+      end
+    end
 
     def store_config_list_params
       if params[:config_list]
@@ -37,10 +43,18 @@ module ActiveScaffold::Actions
         when String
           delete_config_list_params
         when Array
-          save_config_list_params(config_list)
+          save_config_list_params(config_list, config_list_sorting_params)
         end
       end
     end
+    
+    def config_list_sorting_params
+      sorting_params = params.delete(:config_list_sorting)
+      if sorting_params
+        sorting_params = sorting_params.values.select{ |c,d| c.present? && d.present? }
+        sorting_params if sorting_params.present?
+      end
+    end
 
     def config_list_session_storage_method
       respond_to?(:custom_config_list_session_storage) ? :custom_config_list_session_storage : :active_scaffold_session_storage
@@ -55,18 +69,27 @@ module ActiveScaffold::Actions
       if active_scaffold_config.config_list.save_to_user && current_user = send(active_scaffold_config.class.security.current_user_method)
         current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name).destroy
       else
-        config_list_session_storage[:config_list] = nil
+        config_list_session_storage['config_list'] = nil
+        config_list_session_storage['config_list_sorting'] = nil
       end
+      active_scaffold_config.list.user['sort'] = nil
+      logger.debug "list #{active_scaffold_config.list.sorting.object_id}"
       @config_list_params = nil
+      @config_list_sorting = nil
     end
 
-    def save_config_list_params(config_list)
+    def save_config_list_params(config_list, config_list_sorting)
       if active_scaffold_config.config_list.save_to_user && current_user = send(active_scaffold_config.class.security.current_user_method)
-        current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name).update_attribute :config_list, config_list.join(',')
+        record = current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
+        record.config_list = config_list.join(',')
+        record.config_list_sorting = config_list_sorting if record.respond_to? :config_list_sorting
+        record.save
       else
-        config_list_session_storage[:config_list] = config_list.map(&:to_sym)
+        config_list_session_storage['config_list'] = config_list.map(&:to_sym)
+        config_list_session_storage['config_list_sorting'] = config_list_sorting
       end
       @config_list_params = config_list.map(&:to_sym)
+      @config_list_sorting = config_list_sorting
     end
 
     def objects_for_etag
@@ -99,11 +122,20 @@ module ActiveScaffold::Actions
         params = config_list_record.config_list
         params.split(',').map(&:to_sym) if params
       else
-        config_list_session_storage[:config_list]
+        config_list_session_storage['config_list']
       end unless defined? @config_list_params
       @config_list_params || active_scaffold_config.config_list.default_columns
     end
 
+    def config_list_sorting
+      @config_list_sorting = if config_list_record 
+        config_list_record.config_list_sorting if config_list_record.respond_to? :config_list_sorting
+      else
+        config_list_session_storage['config_list_sorting']
+      end unless defined? @config_list_sorting
+      @config_list_sorting
+    end
+
     def list_columns
       @list_columns ||= begin
         columns = super

data/lib/active_scaffold/config/config_list.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Config
       super
       @link = self.class.link.clone unless self.class.link.nil?
       @save_to_user = self.class.save_to_user
+      @draggable = self.class.draggable
     end
 
     # global level configuration
@@ -20,11 +21,15 @@ module ActiveScaffold::Config
 
     # configures where the plugin itself is located. there is no instance version of this.
     cattr_accessor :plugin_directory
-    @@plugin_directory = File.expand_path(__FILE__).match(%{(^.*)/lib/active_scaffold/config/config_list.rb})[1]
+    self.plugin_directory = File.expand_path(__FILE__).match(%{(^.*)/lib/active_scaffold/config/config_list.rb})[1]
 
     # configures the method in user model to save list configuration for every controller
     cattr_accessor :save_to_user
 
+    # enable draggable lists to select displayed columns (enabled by default)
+    cattr_accessor :draggable
+    self.draggable = true
+
     # instance-level configuration
     # ----------------------------
     # the label= method already exists in the Form base class
@@ -39,6 +44,9 @@ module ActiveScaffold::Config
     # configures the method in user model to save list configuration for every controller
     attr_accessor :save_to_user
 
+    # enable draggable lists to select displayed columns
+    attr_accessor :draggable
+
     # provides access to the list of columns specifically meant for the config_list to use
     def columns
       unless @columns # lazy evaluation

data/lib/active_scaffold_config_list.rb

@@ -12,8 +12,4 @@ module ActiveScaffold
   module Config
     ActiveScaffold.autoload_subdir('config', self, File.dirname(__FILE__))
   end
-
-  module Helpers
-    ActiveScaffold.autoload_subdir('helpers', self, File.dirname(__FILE__))
-  end
 end

data/lib/active_scaffold_config_list/engine.rb

@@ -4,10 +4,6 @@ module ActiveScaffoldConfigList
       ActiveSupport.on_load(:action_controller) do
         require "active_scaffold_config_list/config/core.rb"
       end
-
-      ActiveSupport.on_load(:action_view) do
-        include ActiveScaffold::Helpers::ConfigListHelpers
-      end
     end
   end
 end

data/lib/active_scaffold_config_list/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldConfigList
   module Version
     MAJOR = 3
-    MINOR = 2
-    PATCH = 9
+    MINOR = 3
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_config_list
 version: !ruby/object:Gem::Version 
-  version: 3.2.9
+  hash: 11
+  prerelease: 
+  segments: 
+  - 3
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -9,28 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-07-17 00:00:00 Z
+date: 2014-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.3.0
+        hash: 31
+        segments: 
+        - 3
+        - 4
+        - 4
+        version: 3.4.4
   version_requirements: *id001
-  prerelease: false
-  type: :runtime
   name: active_scaffold
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 2
+        - 2
         version: 3.2.2
   version_requirements: *id002
-  prerelease: false
-  type: :runtime
   name: active_scaffold_sortable
+  prerelease: false
 description: User may reorder and hide/show list columns
 email: activescaffold@googlegroups.com
 executables: []
@@ -45,7 +63,6 @@ files:
 - app/views/active_scaffold_overrides/show_config_list_form.html.erb
 - lib/active_scaffold/actions/config_list.rb
 - lib/active_scaffold/config/config_list.rb
-- lib/active_scaffold/helpers/config_list_helpers.rb
 - lib/active_scaffold_config_list.rb
 - lib/active_scaffold_config_list/config/core.rb
 - lib/active_scaffold_config_list/engine.rb
@@ -55,28 +72,35 @@ files:
 homepage: http://activescaffold.com
 licenses: 
 - MIT
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - &id003 
-    - ">="
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id003
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: User specific column configuration for ActiveScaffold
 test_files: []
 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  metadata.gz: c7f59d06507175af8cd27a5d855a9b2929d1e8b4
-  data.tar.gz: 2fd63bc9bba6663590cfa9d4213b0f11cd6a076f
-SHA512: 
-  metadata.gz: a58336285acf4982720e927732a971342197f3e4c6898ce59fc699ad7620484c11ddc4fcddbb84c579f4c50cb7b33f51b885831c14bb80068a7626e88f5a6863
-  data.tar.gz: 4600ee0d71fc192a0935a85806fdda8518df4f81c2167fc17935cce45694c3cb8838393ed00cb0027144b5613f38ba4ff7738eb1675d8e52e651f2d0806ff17a

data/lib/active_scaffold/helpers/config_list_helpers.rb

@@ -1,10 +0,0 @@
-module ActiveScaffold
-  module Helpers
-    # Helpers that assist with the rendering of a Form Column
-    module ConfigListHelpers
-      def config_list_ol_id
-        "ol_#{element_form_id(:action => :config_list)}"
-      end
-    end
-  end
-end