active_scaffold_config_list 3.2.3 → 3.2.4

data/lib/active_scaffold/actions/config_list.rb

@@ -49,9 +49,29 @@ module ActiveScaffold::Actions
       @config_list_params = config_list.map(&:to_sym)
     end
 
+    def objects_for_etag
+      # only override when list_columns is called, so 
+      if @list_columns && config_list_record
+        @last_modified = [@last_modified, config_list_record.updated_at].compact.maximum if config_list_record.respond_to? :updated_at
+        [super, config_list_record]
+      else
+        super
+      end
+    end
+
+    def config_list_record
+      return @config_list_record if defined? @config_list_record
+      @config_list_record = if active_scaffold_config.config_list.save_to_user
+        current_user = send(ActiveRecordPermissions.current_user_method)
+        if current_user
+          current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
+        end
+      end
+    end
+
     def config_list_params
-      @config_list_params = if active_scaffold_config.config_list.save_to_user && current_user = send(ActiveRecordPermissions.current_user_method)
-        params = current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name).config_list
+      @config_list_params = if config_list_record 
+        params = config_list_record.config_list
         params.split(',').map(&:to_sym) if params
       else
         active_scaffold_session_storage[:config_list]
@@ -62,7 +82,7 @@ module ActiveScaffold::Actions
     def list_columns
       @list_columns ||= begin
         columns = super
-        if !config_list_params.nil? && config_list_params.is_a?(Array)
+        if config_list_params.present?
           config_list = Hash[config_list_params.each_with_index.map{|c,i| [c,i]}]
           columns.select{|column| config_list.include? column.name}.sort{|x,y| config_list[x.name] <=> config_list[y.name]}
         else

data/lib/active_scaffold/config/config_list.rb

@@ -29,7 +29,7 @@ module ActiveScaffold::Config
     # ----------------------------
     # the label= method already exists in the Form base class
     def label
-      @label ? as_(@label) : as_(:config_list_model, :model => @core.label.singularize)
+      @label ? as_(@label) : as_(:config_list_model, :model => @core.label)
     end
 
     # if you do not want to show all columns as a default you may define some

data/lib/active_scaffold_config_list/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_config_list
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 3
   - 2
-  - 3
-  version: 3.2.3
+  - 4
+  version: 3.2.4
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-28 00:00:00 Z
+date: 2013-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: 3.3.0
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
-  requirement: *id001
   name: active_scaffold
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,9 +46,8 @@ dependencies:
         - 2
         - 2
         version: 3.2.2
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
-  requirement: *id002
   name: active_scaffold_sortable
 description: User may reorder and hide/show list columns
 email: activescaffold@googlegroups.com
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: User specific column configuration for ActiveScaffold