From 689cfcfe017aa3c34f0af6692e148359375c493e Mon Sep 17 00:00:00 2001
From: benni <benni@posteo.de>
Date: Fri, 10 Jun 2011 12:03:32 +0200
Subject: [PATCH] Fixed items_per_page helper.

---
 app/helpers/application_helper.rb             | 23 +++++--------------
 .../admin/ordergroups/_ordergroups.html.haml  |  5 ++--
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0bb71662..a38af134 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -28,7 +28,7 @@ module ApplicationHelper
     next_label = "Nächste" + ' &raquo;'
     # Merge other url-options for will_paginate
     params = params.merge({:per_page => per_page})
-    will_paginate collection, :params => params, 'data-remote' => remote,
+    will_paginate collection, :params => params, 'data-remote' => true,
       :previous_label => previous_label, :next_label => next_label
   end
   
@@ -36,23 +36,13 @@ module ApplicationHelper
   def items_per_page(options = {})
     per_page_options = options[:per_page_options] || [20, 50, 100]
     current = options[:current] || @per_page
-    action = options[:action] || controller.action_name
-    update = options[:update] || nil
+    params = params || {}
 
-    links = []
-    per_page_options.each do |per_page|
-      unless per_page == current
-        links << link_to_remote(
-          per_page,
-          { :url => { :action => action, :params => {:per_page => per_page}},
-            :before => "Element.show('loader')",
-            :success => "Element.hide('loader')",
-            :method => :get, :update => update } )
-      else
-        links << per_page 
-      end
+    links = per_page_options.map do |per_page|
+      params.merge!({:per_page => per_page})
+      per_page == current ? per_page : link_to(per_page, params, :remote => true)
     end
-    return "Pro Seite: " + links.join(" ")
+    "Pro Seite: #{links.join(" ")}".html_safe
   end
   
   def sort_td_class_helper(param)
@@ -63,7 +53,6 @@ module ApplicationHelper
 
   def sort_link_helper(text, key, options = {})
     per_page = options[:per_page] || 10
-    action = options[:action] || "list"
     remote = options[:remote].nil? ? true : options[:remote]
     key += "_reverse" if params[:sort] == key
     url = url_for(:sort => key, :page => nil, :per_page => per_page)
diff --git a/app/views/admin/ordergroups/_ordergroups.html.haml b/app/views/admin/ordergroups/_ordergroups.html.haml
index 5a9763c6..4420f169 100644
--- a/app/views/admin/ordergroups/_ordergroups.html.haml
+++ b/app/views/admin/ordergroups/_ordergroups.html.haml
@@ -2,10 +2,9 @@
   %table{:style => "width:100%"}
     %tr
       %td
-        = pagination_links_remote @ordergroups, { :update => "ordergroups" }
+        = pagination_links_remote @ordergroups
       %td{:style => "text-align:right"}
-        - if @ordergroups.size > 20
-          = items_per_page :update => "ordergroups"
+        = items_per_page
 %table.list
   %thead
     %tr