Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 1067

Show
Ignore:
Timestamp:
04/02/05 09:11:17 (4 years ago)
Author:
david
Message:

Added pagination for scaffolding (10 items per page) #964 [mortonda@dgrmm.net]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r1065 r1067  
    11*SVN* 
     2 
     3* Added pagination for scaffolding (10 items per page) #964 [mortonda@dgrmm.net] 
    24 
    35* Added assert_no_cookie and fixed assert_cookie_equal to deal with non-existing cookies #979 [bitsweat] 

  • trunk/actionpack/lib/action_controller/pagination.rb

    r967 r1067  
    167167 
    168168    def paginator_and_collection_for(collection_id, options) #:nodoc: 
    169       klass = eval options[:class_name] 
     169      klass = options[:class_name].constantize 
    170170      page  = @params[options[:parameter]] 
    171171      count = count_collection_for_pagination(klass, options[:conditions]) 

  • trunk/actionpack/lib/action_controller/scaffolding.rb

    r794 r1067  
    100100        module_eval <<-"end_eval", __FILE__, __LINE__ 
    101101          def list#{suffix} 
    102             @#{plural_name} = #{class_name}.find_all 
     102            @#{singular_name}_pages, @#{plural_name} = paginate :#{singular_name}, :per_page => 10 
    103103            render#{suffix}_scaffold "list#{suffix}" 
    104104          end 

  • trunk/actionpack/lib/action_controller/templates/scaffolds/list.rhtml

    r4 r1067  
    2020</table> 
    2121 
     22<%= link_to "Previous page", { :page => instance_variable_get("@#{@scaffold_singular_name}_pages").current.previous } if instance_variable_get("@#{@scaffold_singular_name}_pages").current.previous %> 
     23<%= link_to "Next page", { :page => instance_variable_get("@#{@scaffold_singular_name}_pages").current.next } if instance_variable_get("@#{@scaffold_singular_name}_pages").current.next %>  
     24 
    2225<br /> 
    2326 

  • trunk/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb

    r951 r1067  
    1313<% end -%> 
    1414  def list<%= suffix %> 
    15     @<%= plural_name %> = <%= model_name %>.find_all 
     15    @<%= singular_name %>_pages, @<%= plural_name %> = paginate :<%= singular_name %>, :per_page => 10 
    1616  end 
    1717 

  • trunk/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml

    r951 r1067  
    2020</table> 
    2121 
     22<%%= link_to "Previous page", { :page => @<%= singular_name %>_pages.current.previous } if @<%= singular_name %>_pages.current.previous %> 
     23<%%= link_to "Next page", { :page => @<%= singular_name %>_pages.current.next } if @<%= singular_name %>_pages.current.next %>  
     24 
    2225<br /> 
    2326