Merge branch 'master' into openstreetbugs

[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 fac7c442fd375d5152628b9aedda4ae0db226641..c19c0ac6c52544cbaf766f5bca37869446669ae1 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -3,7 +3,7 @@
 <h1><%= t('user.list.heading') %></h1>
 
 <% unless @users.empty? %>
 <h1><%= t('user.list.heading') %></h1>
 
 <% unless @users.empty? %>

-  <% form_tag 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] %>
     <%= 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] %>


@@ -22,13 +22,7 @@
           <% end %>
         </td>
         <td>
           <% end %>
         </td>
         <td>

-          <%=
-            check_box_tag("user_all", "1", false, :onchange => update_page do |page|
-              @users.each do |user|
-                page << "$('user_#{user.id}').checked = $('user_all').checked;"
-              end
-            end)
-          %>
+          <%= check_box_tag "user_all", "1", false %>

         </td>
       </tr>
       <%= render :partial => 'user', :collection => @users %>
         </td>
       </tr>
       <%= render :partial => 'user', :collection => @users %>


@@ -38,6 +32,12 @@
       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>
       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>

+
+    <script type="text/javascript">
+     $("#user_all").change(function () {
+       $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
+     });
+    </script>

   <% end %>
 <% else %>
   <p><%= t "user.list.empty" %></p>
   <% end %>
 <% else %>
   <p><%= t "user.list.empty" %></p>