Use before_validation with :on rather than before_validation_on_xxx

[rails.git] / app / views / user / list.html.erb

diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index 6f010e267452eb788d03f07cec3f48b010c949a4..fac7c442fd375d5152628b9aedda4ae0db226641 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -3,7 +3,10 @@
 <h1><%= t('user.list.heading') %></h1>
 
 <% unless @users.empty? %>
 <h1><%= t('user.list.heading') %></h1>
 
 <% unless @users.empty? %>

-  <% form_tag :status => params[:status], :ip => params[:ip] do %>
+  <% form_tag do %>
+    <%= hidden_field_tag :status, params[:status] if params[:status] %>
+    <%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
+    <%= hidden_field_tag :page, params[:page] if params[:page] %>

     <table id="user_list">
       <tr>
         <td colspan="2">
     <table id="user_list">
       <tr>
         <td colspan="2">


@@ -11,10 +14,11 @@
               :page => @user_pages.current_page.number,
               :first_item => @user_pages.current_page.first_item,
               :last_item => @user_pages.current_page.last_item,
               :page => @user_pages.current_page.number,
               :first_item => @user_pages.current_page.first_item,
               :last_item => @user_pages.current_page.last_item,

+              :items => @user_pages.item_count,

               :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
           %>
           <% if @user_pages.page_count > 1 %>
               :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
           %>
           <% if @user_pages.page_count > 1 %>

-          | <%= pagination_links_each(@user_pages, {}) { |n| link_to n, :page => n } %>
+          | <%= pagination_links_each(@user_pages, {}) { |n| link_to n, params.merge(:page => n) } %>

           <% end %>
         </td>
         <td>
           <% end %>
         </td>
         <td>