active_scaffold_vho 3.2.7 → 3.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ODYyNmNhOThiNDY0MmRhYWIzNmM2ZjBlYzM1MzdhOTI0ZTc2M2U2Nw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
NGQ1YzFjNGNkZDg5MDQ3ZWIyZDc4YjI0YzNmMDQ0YjZkZmIzYTcxOA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ZmM3Zjk1YWJiMTIwZGQ0ZjNmNmM0YjBlZWE0NzZhZWQ3OWU3NWRiODVjYTUw
|
10
|
+
OWI2ZThkNzcwOWY3ZGQ2ZGRjNmRiYTViYWIyNTlhNGYwZWY4NjZkNzUzMGYw
|
11
|
+
MjU4NmRkMmQ3MmFmYTFhNTUwYzkxY2FhNzNjMWZiNTU5MWY0Njc=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NmJiNTZhM2VlYmJhN2QzZWIxMTc1OTRmMDhjZmE4ZTdjYzRlNTBmMjliYmQ3
|
14
|
+
ZmE1OTJhYmQxMTdmMjcxNWNjYmQ5NTE5MjUwMWRmNTQ0ZWNkZjZiZjcxMmYy
|
15
|
+
MTg0Y2Q5NDQ0YzNiNGE3ZTU4YmEyMmM0NWZmNTYwMWVhOGVjOTc=
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
active_scaffold_vho (3.2.
|
4
|
+
active_scaffold_vho (3.2.7)
|
5
5
|
kaminari
|
6
6
|
rails (>= 3.1.0)
|
7
7
|
|
@@ -39,18 +39,18 @@ GEM
|
|
39
39
|
builder (3.0.4)
|
40
40
|
erubis (2.7.0)
|
41
41
|
hike (1.2.3)
|
42
|
-
i18n (0.6.
|
42
|
+
i18n (0.6.11)
|
43
43
|
journey (1.0.4)
|
44
44
|
json (1.8.1)
|
45
|
-
kaminari (0.
|
45
|
+
kaminari (0.16.1)
|
46
46
|
actionpack (>= 3.0.0)
|
47
47
|
activesupport (>= 3.0.0)
|
48
48
|
mail (2.5.4)
|
49
49
|
mime-types (~> 1.16)
|
50
50
|
treetop (~> 1.4.8)
|
51
51
|
mime-types (1.25.1)
|
52
|
-
multi_json (1.10.
|
53
|
-
polyglot (0.3.
|
52
|
+
multi_json (1.10.1)
|
53
|
+
polyglot (0.3.5)
|
54
54
|
rack (1.4.5)
|
55
55
|
rack-cache (1.2)
|
56
56
|
rack (>= 0.4)
|
@@ -88,7 +88,7 @@ GEM
|
|
88
88
|
treetop (1.4.15)
|
89
89
|
polyglot
|
90
90
|
polyglot (>= 0.3.1)
|
91
|
-
tzinfo (0.3.
|
91
|
+
tzinfo (0.3.41)
|
92
92
|
|
93
93
|
PLATFORMS
|
94
94
|
ruby
|
@@ -16,7 +16,7 @@ module ActiveScaffold
|
|
16
16
|
end
|
17
17
|
|
18
18
|
ActiveSupport.on_load(:action_view) do
|
19
|
-
['name_option_for_datetime', 'action_view_rendering', 'action_view_resolver', 'usa_state'].each do |extension|
|
19
|
+
['name_option_for_datetime', 'action_view_rendering', 'action_view_resolver', 'usa_state', 'kaminari_first_page_patch'].each do |extension|
|
20
20
|
require "#{File.dirname __FILE__}/extensions/#{extension}.rb"
|
21
21
|
end
|
22
22
|
include ActiveScaffold::Helpers::ViewHelpers
|
@@ -0,0 +1,10 @@
|
|
1
|
+
module Kaminari
|
2
|
+
module Helpers
|
3
|
+
class Tag
|
4
|
+
#kaminary sets page 1 to nil.. that conflicts withc activescaffold, cause in case of nil we try to use page stored in session
|
5
|
+
def page_url_for(page)
|
6
|
+
@template.url_for @params.merge(@param_name => (page <= 1 ? 1 : page), :only_path => true)
|
7
|
+
end
|
8
|
+
end
|
9
|
+
end
|
10
|
+
end
|
@@ -124,8 +124,8 @@ module ActiveScaffold
|
|
124
124
|
format_column_value(record, column)
|
125
125
|
else
|
126
126
|
value = record.send(column.name)
|
127
|
-
|
128
|
-
text, val = column.options[:options].find {|text, val| (val
|
127
|
+
|
128
|
+
text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
|
129
129
|
value = active_scaffold_translated_option(column, text, val).first if text
|
130
130
|
format_column_value(record, column, value)
|
131
131
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active_scaffold_vho
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.2.
|
4
|
+
version: 3.2.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Many, see README
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-09-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: shoulda
|
@@ -268,6 +268,7 @@ files:
|
|
268
268
|
- lib/active_scaffold/extensions/action_view_resolver.rb
|
269
269
|
- lib/active_scaffold/extensions/active_association_reflection.rb
|
270
270
|
- lib/active_scaffold/extensions/array.rb
|
271
|
+
- lib/active_scaffold/extensions/kaminari_first_page_patch.rb
|
271
272
|
- lib/active_scaffold/extensions/localize.rb
|
272
273
|
- lib/active_scaffold/extensions/name_option_for_datetime.rb
|
273
274
|
- lib/active_scaffold/extensions/nil_id_in_url_params.rb
|