@@ -1,5 +1,6 @@ == master +* Automatically determine the colspan for the last footer to match the number of headers * Fix default headers including all model columns when using :select in the collection query == 0.2.0 / 2009-04-25 CHANGELOG.rdoc @@ -25,6 +25,11 @@ module TableHelper end def html #:nodoc: + # Force the last cell to span the remaining columns + cells = row.cells.values + colspan = table.header.columns.length - cells[0..-2].inject(0) {|count, (name, cell)| count += (cell[:colspan] || 1).to_i} + cells.last[:colspan] ||= colspan if colspan > 1 + html_options = @html_options.dup html_options[:style] = "display: none; #{html_options[:style]}".strip if table.empty? && hide_when_empty lib/table_helper/footer.rb @@ -44,8 +44,8 @@ end class FooterWithCellsTest < Test::Unit::TestCase def setup - table = TableHelper::CollectionTable.new([Object.new]) - @footer = TableHelper::Footer.new(table) + @table = TableHelper::CollectionTable.new([Object.new]) + @footer = TableHelper::Footer.new(@table) @cell = @footer.cell :total, 20 end @@ -63,6 +63,19 @@ class FooterWithCellsTest < Test::Unit::TestCase end_str assert_html_equal expected, @footer.html end + + def test_should_include_colspan_if_more_headers_than_footers + @table.header :title, :name, :value + + expected = <<-end_str + <tfoot> + <tr> + <td class="object-total" colspan="3">20</td> + </tr> + </tfoot> + end_str + assert_html_equal expected, @footer.html + end end class FooterWithEmptyCollectionTest < Test::Unit::TestCase test/unit/footer_test.rb b9e107d93ebc73d10a310ccd12401054057b822b Aaron Pfeifer aaron.pfeifer@gmail.com http://github.com/pluginaweek/table_helper/commit/f06b813b71a974b1a58bff63f6669ce3bc26726f f06b813b71a974b1a58bff63f6669ce3bc26726f 2009-04-25T17:24:39-07:00 2009-04-25T17:24:39-07:00 Automatically determine the colspan for the last footer to match the number of headers [#3 state:resolved] d98280d7961698a48add29301608a5f93885ce37 Aaron Pfeifer aaron.pfeifer@gmail.com