@@ -1,6 +1,6 @@ spec = Gem::Specification.new do |s| s.name = "scaffolding_extensions" - s.version = '1.3.9' + s.version = '1.3.10' s.author = "Jeremy Evans" s.email = "code@jeremyevans.net" s.platform = Gem::Platform::RUBY scaffolding_extensions.gemspec @@ -30,7 +30,7 @@ <%= scaffold_form(scaffold_url("results#{@scaffold_suffix}")) %> <%= scaffold_field_tag(:hidden, :value=>@scaffold_search_results_form_params[:page], :id=>'page') %> <% @scaffold_search_results_form_params[:model].each do |key, value| -%> - <%= scaffold_field_tag(:hidden, :value=>value, :id=>"#{@scaffold_singular_name}_#{key}", :name=>"#{@scaffold_singular_name}[#{key}]") %> + <%= scaffold_field_tag(:hidden, :value=>value, :id=>"#{@scaffold_options[:singular_name]}_#{key}", :name=>"#{@scaffold_options[:singular_name]}[#{key}]") %> <% end %> <% @scaffold_search_results_form_params[:notnull].each do |field| -%> <%= scaffold_field_tag(:hidden, :value=>field, :name=>"notnull#{scaffold_param_list_suffix}") %> @@ -38,8 +38,8 @@ <% @scaffold_search_results_form_params[:null].each do |field| -%> <%= scaffold_field_tag(:hidden, :value=>field, :name=>"null#{scaffold_param_list_suffix}") %> <% end %> - <%= '<input type="submit" name="page_previous" value="Previous Page" >' if @scaffold_search_results_form_params[:page] > 1 %> - <%= '<input type="submit" name="page_next" value="Next Page" >' if @scaffold_search_results_form_params[:next_page] %> + <%= '<input type="submit" name="page_previous" value="Previous Page" />' if @scaffold_search_results_form_params[:page] > 1 %> + <%= '<input type="submit" name="page_next" value="Next Page" />' if @scaffold_search_results_form_params[:next_page] %> </form> <% end %> scaffolds/listtable.rhtml @@ -554,6 +554,57 @@ class ScaffoldingExtensionsTest < Test::Unit::TestCase assert_equal 'page_next', (p/:input)[5][:name] assert_equal "Next Page", (p/:input)[5][:value] assert_equal "submit", (p/:input)[5][:type] + + # Check pagination works when searching with model fields + p = page(port, "#{root}/results_#{model}?#{model}[name]=est") + assert_match %r|#{root}/show_#{model}/#{b}|, (p/:form)[0][:action] + assert_match %r|#{root}/edit_#{model}/#{b}|, (p/:form)[1][:action] + assert_match %r|#{root}/destroy_#{model}/#{b}|, (p/:form)[2][:action] + assert_equal "#{root}/results_#{model}", (p/:form)[3][:action] + assert_equal "post", (p/:form)[3][:method] + assert_equal "page", (p/:input)[3][:name] + assert_equal "1", (p/:input)[3][:value] + assert_equal "hidden", (p/:input)[3][:type] + assert_equal "#{model}[name]", (p/:input)[4][:name] + assert_equal "est", (p/:input)[4][:value] + assert_equal "hidden", (p/:input)[4][:type] + assert_equal 'page_next', (p/:input)[5][:name] + assert_equal "Next Page", (p/:input)[5][:value] + assert_equal "submit", (p/:input)[5][:type] + + # Check second object shows up on second search page + p = page(port, "#{root}/results_#{model}?#{model}[name]=est&page_next=Next+Page&page=1") + assert_match %r|#{root}/show_#{model}/#{t}|, (p/:form)[0][:action] + assert_match %r|#{root}/edit_#{model}/#{t}|, (p/:form)[1][:action] + assert_match %r|#{root}/destroy_#{model}/#{t}|, (p/:form)[2][:action] + assert_equal "#{root}/results_#{model}", (p/:form)[3][:action] + assert_equal "post", (p/:form)[3][:method] + assert_equal "page", (p/:input)[3][:name] + assert_equal "2", (p/:input)[3][:value] + assert_equal "hidden", (p/:input)[3][:type] + assert_equal "#{model}[name]", (p/:input)[4][:name] + assert_equal "est", (p/:input)[4][:value] + assert_equal "hidden", (p/:input)[4][:type] + assert_equal 'page_previous', (p/:input)[5][:name] + assert_equal "Previous Page", (p/:input)[5][:value] + assert_equal "submit", (p/:input)[5][:type] + + # Check first object shows up on first search page + p = page(port, "#{root}/results_#{model}?#{model}[name]=est&page_previous=Previous+Page&page=2") + assert_match %r|#{root}/show_#{model}/#{b}|, (p/:form)[0][:action] + assert_match %r|#{root}/edit_#{model}/#{b}|, (p/:form)[1][:action] + assert_match %r|#{root}/destroy_#{model}/#{b}|, (p/:form)[2][:action] + assert_equal "#{root}/results_#{model}", (p/:form)[3][:action] + assert_equal "post", (p/:form)[3][:method] + assert_equal "page", (p/:input)[3][:name] + assert_equal "1", (p/:input)[3][:value] + assert_equal "hidden", (p/:input)[3][:type] + assert_equal "#{model}[name]", (p/:input)[4][:name] + assert_equal "est", (p/:input)[4][:value] + assert_equal "hidden", (p/:input)[4][:type] + assert_equal 'page_next', (p/:input)[5][:name] + assert_equal "Next Page", (p/:input)[5][:value] + assert_equal "submit", (p/:input)[5][:type] end end test_site/test.rb c3558b64895ee31b84edd0ef94c7cdeaee271cac Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/scaffolding_extensions/commit/d63a93cc9f1893c3248242ab1ebda43b74980d39 d63a93cc9f1893c3248242ab1ebda43b74980d39 2009-10-29T08:56:15-07:00 2009-10-29T08:56:15-07:00 Fix pagination of search results page when searching by field, bump version to 1.3.10 This has probably been broken for a long time (my guess is since February 2008), but was only reported to me today. The problem is the hidden form fields on the search resutls page use the old instance variables instead of the new scaffold_options hash. Fix that and add tests for it. While here, correctly close tags for next and previous page buttons. 77d574d18069e868c85b0ac8138c84570b402e45 Jeremy Evans code@jeremyevans.net