[Fixes browsermedia#724] Allow pagination to work with any model

Author: peakpg

app/helpers/cms/application_helper.rb

@@ -171,18 +171,17 @@ def render_pagination(collection, content_type, options={})
  if collection.blank?
  content_tag(:div, "No Content", :class => "pagination")
  else
- model_class = content_type.instance_of?(Class) ? content_type : content_type.model_class
  render :partial => "pagination", :locals => {
  :collection => collection,
- :first_page_path => polymorphic_path(engine_aware_path(model_class), {:page => 1}.merge(options)),
- :previous_page_path => polymorphic_path(engine_aware_path(model_class), {:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
- :current_page_path => polymorphic_path(engine_aware_path(model_class), options),
- :next_page_path => polymorphic_path(engine_aware_path(model_class), {:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
- :last_page_path => polymorphic_path(engine_aware_path(model_class), {:page => collection.total_pages}.merge(options))
+ :first_page_path => url_for({:page => 1}.merge(options)),
+ :previous_page_path => url_for({:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
+ :current_page_path => url_for(options),
+ :next_page_path => url_for({:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
+ :last_page_path => url_for({:page => collection.total_pages}.merge(options))
  }
  end
  end
-
+ 
  def url_with_mode(url, mode)
  url = "" unless url # Handles cases where request.referrer is nil (see cms/_page_toolbar.html.erb for an example)
  uri = URI.parse(url)

app/views/cms/application/_pagination.html.erb

@@ -10,7 +10,7 @@
  <%= link_to "<< &nbsp;".html_safe, first_page_path, :id => "first_page_link" %>
  <%= link_to "< &nbsp;".html_safe, previous_page_path, :id => "previous_page_link" %>
  <% url = URI.parse(current_page_path) %>
- <%= form_tag url.path, :method => :get, :class => "current_page", style: 'display:inline' do %>
+ <%= form_tag url_for({}), :method => :get, :class => "current_page", style: 'display:inline' do %>
  <% url.query.to_s.split('&').each do |p|
  ; k, v = p.split('=') %>
  <%= hidden_field_tag(k, CGI::unescape(v.to_s), :id => "pagination_hidden_#{k}") unless k == "page" %>