active_scaffold 3.0.1 → 3.0.2

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.
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ = 3.0.2
2
+
3
+ - Two bug fixes and a deprecation silencing.
4
+
1
5
  = 3.0.1
2
6
 
3
7
  - Fixing the requiring of files.
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "active_scaffold"
5
- s.version = "3.0.1"
5
+ s.version = "3.0.2"
6
6
  s.platform = Gem::Platform::RUBY
7
7
  s.authors = ["Many, see README"]
8
8
  s.email = ["activescaffold@googlegroups.com"]
@@ -1,10 +1,13 @@
1
1
  <dl>
2
2
  <% columns.each :for => @record do |column| %>
3
3
  <dt><%= column.label -%></dt>
4
- <dd<%= " class=\"#{column.name}-view #{column.css_class}\"" unless column.is_a? ActiveScaffold::DataStructures::ActionColumns %>>
5
4
  <% if column.is_a? ActiveScaffold::DataStructures::ActionColumns -%>
5
+ <dd>
6
6
  <%= render :partial => 'show_columns', :locals => {:columns => column} %>
7
7
  <% else -%>
8
+ <% css_class = "#{column.name}-view"
9
+ css_class.concat(" #{column.css_class}") unless column.css_class.nil? %>
10
+ <dd class="<%= css_class.strip %>">
8
11
  <%= show_column_value(@record, column) -%> &nbsp;
9
12
  <% end -%>
10
13
  </dd>
@@ -1,3 +1,6 @@
1
+ require 'render_component' rescue nil
2
+ require 'verification'
3
+
1
4
  require 'active_record_permissions'
2
5
  require 'dhtml_confirm'
3
6
  require 'paginator'
@@ -344,19 +344,19 @@ module ActiveScaffold
344
344
  end
345
345
  end
346
346
  end
347
-
347
+
348
348
  def render_nested_view(action_links, url_options, record)
349
349
  rendered = []
350
- action_links.each do |link|
351
- if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && respond_to?(:render_component)
352
- link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
350
+ action_links.each do |link|
351
+ if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && respond_to?(:render_component)
352
+ link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
353
353
  link_id = get_action_link_id(link_url_options, record, link.column)
354
354
  rendered << (render_component(link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
355
- end
355
+ end
356
356
  end
357
357
  rendered.join(' ').html_safe
358
- end
359
-
358
+ end
359
+
360
360
  end
361
361
  end
362
362
  end
@@ -212,7 +212,7 @@ module ActiveScaffold
212
212
  classes << 'empty' if column_empty? column_value
213
213
  classes << 'sorted' if active_scaffold_config.list.user.sorting.sorts_on?(column)
214
214
  classes << 'numeric' if column.column and [:decimal, :float, :integer].include?(column.column.type)
215
- classes.join(' ')
215
+ classes.join(' ').rstrip
216
216
  end
217
217
 
218
218
  def column_heading_class(column, sorting)
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold
3
3
  version: !ruby/object:Gem::Version
4
- hash: 5
4
+ hash: 3
5
5
  prerelease: false
6
6
  segments:
7
7
  - 3
8
8
  - 0
9
- - 1
10
- version: 3.0.1
9
+ - 2
10
+ version: 3.0.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Many, see README
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-11-17 00:00:00 -05:00
18
+ date: 2010-11-18 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency