active_scaffold_config_list 3.3.1 → 3.3.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGQ0NjU3MDZjYWM2MmFhZDcwM2UwMTY1MDExOTIzMTE1YWMyODA3MA==
+  data.tar.gz: !binary |-
+    NWVhNTI3MGY5OWY4YzExNjQ3MzMxYWRmOWE1MjYzYTE3MWIzZWM5Yg==
+SHA512:
+  metadata.gz: !binary |-
+    YjI3ZDRhNTUxZDBkZTI2ZjQ4MjE3MTgyYTA0YjI4NzRmNjRhNTNhODNhZWM0
+    NDliMTM2MDBjMjUxNGE1ZTg4NDZmZTllNzA3YWU0OWNiZTM4YmVkZmVhYmY2
+    MDFkODgwMzY5NDllYTJjM2JiYWJlMzJjNjdhNzc1NDFmZDE2YTQ=
+  data.tar.gz: !binary |-
+    NjBjOTUyMjk1OGQyMGM5ZGE5NDE3ZDgxNTU2MTk4NGI5NGVjMTJkMDI4YTky
+    ZmMwZmUzNzZkOTJhM2I5NTkzM2ZhN2M0ZTVlNGVkNmM2YWZiNTc3MmNiNTRm
+    YzljYmM5YzFjNDVmODVjYmJlYjc2OTJiNGMxZDIzM2ZhZmQ0OWM=

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

@@ -21,7 +21,7 @@
     <dd><ol>
 <%
   columns_options = list_columns.select{|c| c.sortable?}.map{|c| [c.label, c.name]}
-  order_options = ['asc', 'desc']
+  order_options = ['asc', 'desc'].map{ |v| [as_(v), v] }
   selected = config_list_sorting || []
   3.times do |i|
 %>

data/config/locales/de.yml

@@ -1,6 +1,8 @@
 de: 
-  active_scaffold: 
+  active_scaffold:
+    asc: asc
     config_list: Konfigurieren
     config_list_model: "Konfiguriere Spalten für %{model}"
     columns: Columns
     default_sorting: Default Sorting
+    desc: desc

data/config/locales/en.yml

@@ -1,6 +1,8 @@
 en: 
   active_scaffold: 
+    asc: asc
     config_list: Configure
     config_list_model: "Configure Columns for %{model}"
     columns: Columns
     default_sorting: Default Sorting
+    desc: desc

data/config/locales/es.yml

@@ -1,6 +1,8 @@
 es: 
   active_scaffold: 
+    asc: asc
     config_list: Configurar
     config_list_model: "Configurar columnas de %{model}"
     columns: Columnas
     default_sorting: Orden por defecto
+    desc: desc

data/config/locales/fr.yml

@@ -1,6 +1,8 @@
 fr: 
   active_scaffold: 
+    asc: asc
     config_list: Configurer
     config_list_model: "Configurer les colonnes pour %{model}"
     columns: Columns
     default_sorting: Default Sorting
+    desc: desc

data/config/locales/hu.yml

@@ -1,6 +1,8 @@
 hu: 
   active_scaffold: 
+    asc: asc
     config_list: Configure
     config_list_model: "Configure Columns for %{model}"
     columns: Columns
     default_sorting: Default Sorting
+    desc: desc

data/config/locales/ja.yml

@@ -1,6 +1,8 @@
 ja: 
   active_scaffold: 
+    asc: asc
     config_list: Configure
     config_list_model: "Configure Columns for %{model}"
     columns: Columns
     default_sorting: Default Sorting
+    desc: desc

data/config/locales/ru.yml

@@ -1,6 +1,8 @@
 ru: 
   active_scaffold: 
+    asc: asc
     config_list: "Настройки списка"
     config_list_model: "%{model}: настройки списка"
     columns: Columns
     default_sorting: Default Sorting
+    desc: desc

data/lib/active_scaffold/actions/config_list.rb

@@ -31,7 +31,7 @@ module ActiveScaffold::Actions
     protected
     
     def set_default_sorting
-      unless active_scaffold_config.list.user['sort'] || (params['sort'] and params['sort_direction'])
+      if (params['sort_direction'] && params['sort_direction'] == 'reset') || (active_scaffold_config.list.user['sort'].blank? && params['sort'].blank?)
         active_scaffold_config.list.user.sorting.set *config_list_sorting if config_list_sorting
       end
     end

data/lib/active_scaffold/config/config_list.rb

@@ -48,17 +48,11 @@ module ActiveScaffold::Config
     attr_accessor :draggable
 
     # provides access to the list of columns specifically meant for the config_list to use
-    def columns
-      unless @columns # lazy evaluation
-        self.columns = @core.columns._inheritable
-        self.columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
-        self.columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
-      end
-      @columns
+    columns_accessor :columns do
+      columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
+      columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
     end
     
-    public :columns=
-    
     # the ActionLink for this action
     attr_accessor :link
   end

data/lib/active_scaffold_config_list/version.rb

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

metadata

@@ -1,63 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_scaffold_config_list
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 3
-  - 3
-  - 1
-  version: 3.3.1
+version: !ruby/object:Gem::Version
+  version: 3.3.2
 platform: ruby
-authors: 
+authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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 
-        hash: 31
-        segments: 
-        - 3
-        - 4
-        - 4
-        version: 3.4.4
-  version_requirements: *id001
+date: 2015-12-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: active_scaffold
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.4.31
   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
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.4.31
+- !ruby/object:Gem::Dependency
   name: active_scaffold_sortable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 description: User may reorder and hide/show list columns
 email: activescaffold@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- README
+files:
+- LICENSE.txt
 - README
-files: 
 - app/views/active_scaffold_overrides/_show_config_list_form.html.erb
 - app/views/active_scaffold_overrides/_show_config_list_form_body.html.erb
 - app/views/active_scaffold_overrides/show_config_list_form.html.erb
@@ -74,40 +63,28 @@ files:
 - lib/active_scaffold_config_list/config/core.rb
 - lib/active_scaffold_config_list/engine.rb
 - lib/active_scaffold_config_list/version.rb
-- LICENSE.txt
-- README
 homepage: http://activescaffold.com
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: User specific column configuration for ActiveScaffold
 test_files: []
-