gridion 0.0.15 → 0.0.16

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.
@@ -110,6 +110,8 @@ module Gridion
110
110
  elsif formats[col].kind_of?(Hash)
111
111
  if formats[col].has_key?(:date)
112
112
  value=value.try(:to_date).try(:to_s, formats[col][:date])
113
+ elsif formats[col].has_key?(:datetime)
114
+ value=value.try(:to_s, formats[col][:datetime])
113
115
  end
114
116
  elsif formats[col].kind_of?(Proc)
115
117
  # use hook
@@ -125,10 +127,19 @@ module Gridion
125
127
 
126
128
  if options.has_key?(:children)
127
129
  result << "<td class=\"children\">"
128
- options[:children].each do |child|
129
- label= child.to_s.singularize.classify.constantize.model_name.human.pluralize
130
+ children_hash=
131
+ if options[:children].kind_of?(Array)
132
+ options[:children].each_with_object({}) {|child, h| h[child]=child.to_s.singularize.classify.constantize.model_name.human.pluralize }
133
+ else
134
+ options[:children].keys.each_with_object({}) {|child, h| h[child]=options[:children][child]||child.to_s.singularize.classify.constantize.model_name.human.pluralize}
135
+ end
136
+
137
+ children_hash.keys.each do |child|
138
+ label= children_hash[child]
139
+ label||= child.to_s.singularize.classify.constantize.model_name.human.pluralize
130
140
  result << link_to(label, [namespaces, object, child].flatten, :class=>"child_link #{child.to_s}")
131
141
  end
142
+
132
143
  result << "</td>"
133
144
  end
134
145
 
@@ -1,3 +1,3 @@
1
1
  module Gridion
2
- VERSION = "0.0.15"
2
+ VERSION = "0.0.16"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gridion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.15
4
+ version: 0.0.16
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-08 00:00:00.000000000Z
12
+ date: 2011-12-02 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sqlite3
16
- requirement: &70272272180660 !ruby/object:Gem::Requirement
16
+ requirement: &70223266421760 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70272272180660
24
+ version_requirements: *70223266421760
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: kaminari
27
- requirement: &70272272177440 !ruby/object:Gem::Requirement
27
+ requirement: &70223266421260 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70272272177440
35
+ version_requirements: *70223266421260
36
36
  description: Simple grid helper for rails
37
37
  email:
38
38
  - william@tofugear.com
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
90
90
  version: '0'
91
91
  segments:
92
92
  - 0
93
- hash: 1481035121303311233
93
+ hash: -2662129059111446417
94
94
  required_rubygems_version: !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
99
99
  version: '0'
100
100
  segments:
101
101
  - 0
102
- hash: 1481035121303311233
102
+ hash: -2662129059111446417
103
103
  requirements: []
104
104
  rubyforge_project:
105
105
  rubygems_version: 1.8.10