Changeset 291
- Timestamp:
- 04/28/08 11:07:38 (7 months ago)
- Files:
-
- branches/log_indexing_time_with_ferret/lib/picolena/templates/app/controllers/documents_controller.rb (modified) (1 diff)
- branches/log_indexing_time_with_ferret/lib/picolena/templates/app/helpers/documents_helper.rb (modified) (1 diff)
- branches/log_indexing_time_with_ferret/lib/picolena/templates/app/views/documents/show.html.haml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/log_indexing_time_with_ferret/lib/picolena/templates/app/controllers/documents_controller.rb
r283 r291 23 23 start=Time.now 24 24 @query=[params[:id],params.delete(:format)].compact.join('.') 25 sort=params[:sort]25 @sort=params[:sort] 26 26 page=params[:page]||1 27 finder=Finder.new(@query, sort,page)27 finder=Finder.new(@query,@sort,page) 28 28 finder.execute! 29 29 pager=::Paginator.new(finder.total_hits, Picolena::ResultsPerPage) do branches/log_indexing_time_with_ferret/lib/picolena/templates/app/helpers/documents_helper.rb
r283 r291 7 7 # Very basic pagination. 8 8 # Provides liks to Next, Prev and FirstPage when needed. 9 def should_paginate(page,query )10 [(link_to("←←", :action => :show, :id => query, : page => 1) if page.number>2),11 (link_to("←", :action => :show, :id => query, :page => page.prev.number ) if page.prev?),12 (link_to("→", :action => :show, :id => query, :page => page.next.number ) if page.next?)].compact.join(" | ")9 def should_paginate(page,query, sort) 10 [(link_to("←←", :action => :show, :id => query, :sort=>sort) if page.number>2), 11 (link_to("←", :action => :show, :id => query, :page => page.prev.number, :sort=>sort) if page.prev?), 12 (link_to("→", :action => :show, :id => query, :page => page.next.number, :sort=>sort) if page.next?)].compact.join(" | ") 13 13 end 14 14 branches/log_indexing_time_with_ferret/lib/picolena/templates/app/views/documents/show.html.haml
r283 r291 8 8 =show_time_needed(@time_needed) 9 9 -else 10 %span{:class=>'pagination'}=should_paginate(@matching_documents, @query )10 %span{:class=>'pagination'}=should_paginate(@matching_documents, @query, @sort) 11 11 =describe_results(@matching_documents, @total_hits, @time_needed, h(@query)) 12 12 -unless nothing_found?
