active_scaffold_config_list 3.3.1 → 3.3.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZGQ0NjU3MDZjYWM2MmFhZDcwM2UwMTY1MDExOTIzMTE1YWMyODA3MA==
5
+ data.tar.gz: !binary |-
6
+ NWVhNTI3MGY5OWY4YzExNjQ3MzMxYWRmOWE1MjYzYTE3MWIzZWM5Yg==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ YjI3ZDRhNTUxZDBkZTI2ZjQ4MjE3MTgyYTA0YjI4NzRmNjRhNTNhODNhZWM0
10
+ NDliMTM2MDBjMjUxNGE1ZTg4NDZmZTllNzA3YWU0OWNiZTM4YmVkZmVhYmY2
11
+ MDFkODgwMzY5NDllYTJjM2JiYWJlMzJjNjdhNzc1NDFmZDE2YTQ=
12
+ data.tar.gz: !binary |-
13
+ NjBjOTUyMjk1OGQyMGM5ZGE5NDE3ZDgxNTU2MTk4NGI5NGVjMTJkMDI4YTky
14
+ ZmMwZmUzNzZkOTJhM2I5NTkzM2ZhN2M0ZTVlNGVkNmM2YWZiNTc3MmNiNTRm
15
+ YzljYmM5YzFjNDVmODVjYmJlYjc2OTJiNGMxZDIzM2ZhZmQ0OWM=
@@ -21,7 +21,7 @@
21
21
  <dd><ol>
22
22
  <%
23
23
  columns_options = list_columns.select{|c| c.sortable?}.map{|c| [c.label, c.name]}
24
- order_options = ['asc', 'desc']
24
+ order_options = ['asc', 'desc'].map{ |v| [as_(v), v] }
25
25
  selected = config_list_sorting || []
26
26
  3.times do |i|
27
27
  %>
@@ -1,6 +1,8 @@
1
1
  de:
2
- active_scaffold:
2
+ active_scaffold:
3
+ asc: asc
3
4
  config_list: Konfigurieren
4
5
  config_list_model: "Konfiguriere Spalten für %{model}"
5
6
  columns: Columns
6
7
  default_sorting: Default Sorting
8
+ desc: desc
@@ -1,6 +1,8 @@
1
1
  en:
2
2
  active_scaffold:
3
+ asc: asc
3
4
  config_list: Configure
4
5
  config_list_model: "Configure Columns for %{model}"
5
6
  columns: Columns
6
7
  default_sorting: Default Sorting
8
+ desc: desc
@@ -1,6 +1,8 @@
1
1
  es:
2
2
  active_scaffold:
3
+ asc: asc
3
4
  config_list: Configurar
4
5
  config_list_model: "Configurar columnas de %{model}"
5
6
  columns: Columnas
6
7
  default_sorting: Orden por defecto
8
+ desc: desc
@@ -1,6 +1,8 @@
1
1
  fr:
2
2
  active_scaffold:
3
+ asc: asc
3
4
  config_list: Configurer
4
5
  config_list_model: "Configurer les colonnes pour %{model}"
5
6
  columns: Columns
6
7
  default_sorting: Default Sorting
8
+ desc: desc
@@ -1,6 +1,8 @@
1
1
  hu:
2
2
  active_scaffold:
3
+ asc: asc
3
4
  config_list: Configure
4
5
  config_list_model: "Configure Columns for %{model}"
5
6
  columns: Columns
6
7
  default_sorting: Default Sorting
8
+ desc: desc
@@ -1,6 +1,8 @@
1
1
  ja:
2
2
  active_scaffold:
3
+ asc: asc
3
4
  config_list: Configure
4
5
  config_list_model: "Configure Columns for %{model}"
5
6
  columns: Columns
6
7
  default_sorting: Default Sorting
8
+ desc: desc
@@ -1,6 +1,8 @@
1
1
  ru:
2
2
  active_scaffold:
3
+ asc: asc
3
4
  config_list: "Настройки списка"
4
5
  config_list_model: "%{model}: настройки списка"
5
6
  columns: Columns
6
7
  default_sorting: Default Sorting
8
+ desc: desc
@@ -31,7 +31,7 @@ module ActiveScaffold::Actions
31
31
  protected
32
32
 
33
33
  def set_default_sorting
34
- unless active_scaffold_config.list.user['sort'] || (params['sort'] and params['sort_direction'])
34
+ if (params['sort_direction'] && params['sort_direction'] == 'reset') || (active_scaffold_config.list.user['sort'].blank? && params['sort'].blank?)
35
35
  active_scaffold_config.list.user.sorting.set *config_list_sorting if config_list_sorting
36
36
  end
37
37
  end
@@ -48,17 +48,11 @@ module ActiveScaffold::Config
48
48
  attr_accessor :draggable
49
49
 
50
50
  # provides access to the list of columns specifically meant for the config_list to use
51
- def columns
52
- unless @columns # lazy evaluation
53
- self.columns = @core.columns._inheritable
54
- self.columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
55
- self.columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
56
- end
57
- @columns
51
+ columns_accessor :columns do
52
+ columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
53
+ columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
58
54
  end
59
55
 
60
- public :columns=
61
-
62
56
  # the ActionLink for this action
63
57
  attr_accessor :link
64
58
  end
@@ -2,7 +2,7 @@ module ActiveScaffoldConfigList
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 3
5
- PATCH = 1
5
+ PATCH = 2
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,63 +1,52 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold_config_list
3
- version: !ruby/object:Gem::Version
4
- hash: 9
5
- prerelease:
6
- segments:
7
- - 3
8
- - 3
9
- - 1
10
- version: 3.3.1
3
+ version: !ruby/object:Gem::Version
4
+ version: 3.3.2
11
5
  platform: ruby
12
- authors:
6
+ authors:
13
7
  - Sergio Cambra
14
8
  autorequire:
15
9
  bindir: bin
16
10
  cert_chain: []
17
-
18
- date: 2014-09-02 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
21
- type: :runtime
22
- requirement: &id001 !ruby/object:Gem::Requirement
23
- none: false
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- hash: 31
28
- segments:
29
- - 3
30
- - 4
31
- - 4
32
- version: 3.4.4
33
- version_requirements: *id001
11
+ date: 2015-12-03 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
34
14
  name: active_scaffold
35
- prerelease: false
36
- - !ruby/object:Gem::Dependency
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ! '>='
18
+ - !ruby/object:Gem::Version
19
+ version: 3.4.31
37
20
  type: :runtime
38
- requirement: &id002 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 11
44
- segments:
45
- - 3
46
- - 2
47
- - 2
48
- version: 3.2.2
49
- version_requirements: *id002
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ! '>='
25
+ - !ruby/object:Gem::Version
26
+ version: 3.4.31
27
+ - !ruby/object:Gem::Dependency
50
28
  name: active_scaffold_sortable
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ! '>='
32
+ - !ruby/object:Gem::Version
33
+ version: 3.2.2
34
+ type: :runtime
51
35
  prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ! '>='
39
+ - !ruby/object:Gem::Version
40
+ version: 3.2.2
52
41
  description: User may reorder and hide/show list columns
53
42
  email: activescaffold@googlegroups.com
54
43
  executables: []
55
-
56
44
  extensions: []
57
-
58
- extra_rdoc_files:
45
+ extra_rdoc_files:
46
+ - README
47
+ files:
48
+ - LICENSE.txt
59
49
  - README
60
- files:
61
50
  - app/views/active_scaffold_overrides/_show_config_list_form.html.erb
62
51
  - app/views/active_scaffold_overrides/_show_config_list_form_body.html.erb
63
52
  - app/views/active_scaffold_overrides/show_config_list_form.html.erb
@@ -74,40 +63,28 @@ files:
74
63
  - lib/active_scaffold_config_list/config/core.rb
75
64
  - lib/active_scaffold_config_list/engine.rb
76
65
  - lib/active_scaffold_config_list/version.rb
77
- - LICENSE.txt
78
- - README
79
66
  homepage: http://activescaffold.com
80
- licenses:
67
+ licenses:
81
68
  - MIT
69
+ metadata: {}
82
70
  post_install_message:
83
71
  rdoc_options: []
84
-
85
- require_paths:
72
+ require_paths:
86
73
  - lib
87
- required_ruby_version: !ruby/object:Gem::Requirement
88
- none: false
89
- requirements:
90
- - - ">="
91
- - !ruby/object:Gem::Version
92
- hash: 3
93
- segments:
94
- - 0
95
- version: "0"
96
- required_rubygems_version: !ruby/object:Gem::Requirement
97
- none: false
98
- requirements:
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- hash: 3
102
- segments:
103
- - 0
104
- version: "0"
74
+ required_ruby_version: !ruby/object:Gem::Requirement
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
79
+ required_rubygems_version: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - ! '>='
82
+ - !ruby/object:Gem::Version
83
+ version: '0'
105
84
  requirements: []
106
-
107
85
  rubyforge_project:
108
- rubygems_version: 1.8.29
86
+ rubygems_version: 2.4.4
109
87
  signing_key:
110
- specification_version: 3
88
+ specification_version: 4
111
89
  summary: User specific column configuration for ActiveScaffold
112
90
  test_files: []
113
-