jro_apps/redmine Commit - r12874:8aeab43247f9

Count users with a single query on group list (#16905)....

Jean-Philippe Lang -

r12874:8aeab43247f9

parent child

Context file:

r12874:8aeab43247f9

app/controllers/groups_controller.rb +11 -2

               def index
                 @groups = Group.sorted.all
                 respond_to do |format|
-                  format.html
+                  format.html {
+                    @user_count_by_group_id = user_count_by_group_id
+                  }
                   format.api
                 end
               end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def user_count_by_group_id
+                h = User.joins(:groups).group('group_id').count
+                h.keys.each do |key|
+                  h[key.to_i] = h.delete(key)
+                end
+                h
+              end
             end

app/views/groups/index.html.erb +2 -3

             </div>
             <%= title l(:label_group_plural) %>
             <% if @groups.any? %>
             <table class="list groups">
               <thead><tr>
               </tr></thead>
               <tbody>
             <% @groups.each do |group| %>
-              <tr class="<%= cycle 'odd', 'even' %>">
+              <tr id="group-<%= group.id %>" class="<%= cycle 'odd', 'even' %>">
                 <td class="name"><%= link_to h(group), edit_group_path(group) %></td>
-                <td><%= group.users.size %></td>
+                <td class="user_count"><%= @user_count_by_group_id[group.id] || 0 %></td>
                 <td class="buttons"><%= delete_link group %></td>
               </tr>
             <% end %>

test/functional/groups_controller_test.rb +6 0

                 assert_template 'index'
               end
+              def test_index_should_show_user_count
+                get :index
+                assert_response :success
+                assert_select 'tr#group-11 td.user_count', :text => '1'
+              end
               def test_show
                 get :show, :id => 10
                 assert_response :success

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages