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

Collapse all files

app/controllers/groups_controller.rb +11 -2

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class GroupsController < ApplicationController
               layout 'admin'
               before_filter :require_admin
               before_filter :find_group, :except => [:index, :new, :create]
               accept_api_auth :index, :show, :create, :update, :destroy, :add_users, :remove_user
               helper :custom_fields
               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
               def show
                 respond_to do |format|
                   format.html
                   format.api
                 end
               end
               def new
                 @group = Group.new
               end
               def create
                 @group = Group.new
                 @group.safe_attributes = params[:group]
                 respond_to do |format|
                   if @group.save
                     format.html {
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to(params[:continue] ? new_group_path : groups_path)
                     }
                     format.api  { render :action => 'show', :status => :created, :location => group_url(@group) }
                   else
                     format.html { render :action => "new" }
                     format.api  { render_validation_errors(@group) }
                   end
                 end
               end
               def edit
               end
               def update
                 @group.safe_attributes = params[:group]
                 respond_to do |format|
                   if @group.save
                     flash[:notice] = l(:notice_successful_update)
                     format.html { redirect_to(groups_path) }
                     format.api  { render_api_ok }
                   else
                     format.html { render :action => "edit" }
                     format.api  { render_validation_errors(@group) }
                   end
                 end
               end
               def destroy
                 @group.destroy
                 respond_to do |format|
                   format.html { redirect_to(groups_path) }
                   format.api  { render_api_ok }
                 end
               end
               def add_users
                 @users = User.where(:id => (params[:user_id] || params[:user_ids])).all
                 @group.users << @users if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                   format.js
                   format.api { render_api_ok }
                 end
               end
               def remove_user
                 @group.users.delete(User.find(params[:user_id])) if request.delete?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                   format.js
                   format.api { render_api_ok }
                 end
               end
               def autocomplete_for_user
                 respond_to do |format|
                   format.js
                 end
               end
               def edit_membership
                 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
                 @membership.save if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
                   format.js
                 end
               end
               def destroy_membership
                 Member.find(params[:membership_id]).destroy if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
                   format.js
                 end
               end
               private
               def find_group
                 @group = Group.find(params[:id])
               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 class="contextual">
             <%= link_to l(:label_group_new), new_group_path, :class => 'icon icon-add' %>
             </div>
             <%= title l(:label_group_plural) %>
             <% if @groups.any? %>
             <table class="list groups">
               <thead><tr>
               <th><%=l(:label_group)%></th>
               <th><%=l(:label_user_plural)%></th>
               <th></th>
               </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 %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

test/functional/groups_controller_test.rb +6 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class GroupsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :groups_users
               def setup
                 @request.session[:user_id] = 1
               end
               def test_index
                 get :index
                 assert_response :success
                 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
                 assert_template 'show'
               end
               def test_show_invalid_should_return_404
                 get :show, :id => 99
                 assert_response 404
               end
               def test_new
                 get :new
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?]', 'group[name]'
               end
               def test_create
                 assert_difference 'Group.count' do
                   post :create, :group => {:name => 'New group'}
                 end
                 assert_redirected_to '/groups'
                 group = Group.order('id DESC').first
                 assert_equal 'New group', group.name
                 assert_equal [], group.users
               end
               def test_create_and_continue
                 assert_difference 'Group.count' do
                   post :create, :group => {:name => 'New group'}, :continue => 'Create and continue'
                 end
                 assert_redirected_to '/groups/new'
                 group = Group.order('id DESC').first
                 assert_equal 'New group', group.name
               end
               def test_create_with_failure
                 assert_no_difference 'Group.count' do
                   post :create, :group => {:name => ''}
                 end
                 assert_response :success
                 assert_template 'new'
               end
               def test_edit
                 get :edit, :id => 10
                 assert_response :success
                 assert_template 'edit'
                 assert_select 'div#tab-content-users'
                 assert_select 'div#tab-content-memberships' do
                   assert_select 'a', :text => 'Private child of eCookbook'
                 end
               end
               def test_update
                 new_name = 'New name'
                 put :update, :id => 10, :group => {:name => new_name}
                 assert_redirected_to '/groups'
                 group = Group.find(10)
                 assert_equal new_name, group.name
               end
               def test_update_with_failure
                 put :update, :id => 10, :group => {:name => ''}
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy
                 assert_difference 'Group.count', -1 do
                   post :destroy, :id => 10
                 end
                 assert_redirected_to '/groups'
               end
               def test_add_users
                 assert_difference 'Group.find(10).users.count', 2 do
                   post :add_users, :id => 10, :user_ids => ['2', '3']
                 end
               end
               def test_xhr_add_users
                 assert_difference 'Group.find(10).users.count', 2 do
                   xhr :post, :add_users, :id => 10, :user_ids => ['2', '3']
                   assert_response :success
                   assert_template 'add_users'
                   assert_equal 'text/javascript', response.content_type
                 end
                 assert_match /John Smith/, response.body
               end
               def test_remove_user
                 assert_difference 'Group.find(10).users.count', -1 do
                   delete :remove_user, :id => 10, :user_id => '8'
                 end
               end
               def test_xhr_remove_user
                 assert_difference 'Group.find(10).users.count', -1 do
                   xhr :delete, :remove_user, :id => 10, :user_id => '8'
                   assert_response :success
                   assert_template 'remove_user'
                   assert_equal 'text/javascript', response.content_type
                 end
               end
               def test_new_membership
                 assert_difference 'Group.find(10).members.count' do
                   post :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
                 end
               end
               def test_xhr_new_membership
                 assert_difference 'Group.find(10).members.count' do
                   xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
                   assert_response :success
                   assert_template 'edit_membership'
                   assert_equal 'text/javascript', response.content_type
                 end
                 assert_match /OnlineStore/, response.body
               end
               def test_xhr_new_membership_with_failure
                 assert_no_difference 'Group.find(10).members.count' do
                   xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 999, :role_ids => ['1', '2']}
                   assert_response :success
                   assert_template 'edit_membership'
                   assert_equal 'text/javascript', response.content_type
                 end
                 assert_match /alert/, response.body, "Alert message not sent"
               end
               def test_edit_membership
                 assert_no_difference 'Group.find(10).members.count' do
                   post :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
                 end
               end
               def test_xhr_edit_membership
                 assert_no_difference 'Group.find(10).members.count' do
                   xhr :post, :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
                   assert_response :success
                   assert_template 'edit_membership'
                   assert_equal 'text/javascript', response.content_type
                 end
               end
               def test_destroy_membership
                 assert_difference 'Group.find(10).members.count', -1 do
                   post :destroy_membership, :id => 10, :membership_id => 6
                 end
               end
               def test_xhr_destroy_membership
                 assert_difference 'Group.find(10).members.count', -1 do
                   xhr :post, :destroy_membership, :id => 10, :membership_id => 6
                   assert_response :success
                   assert_template 'destroy_membership'
                   assert_equal 'text/javascript', response.content_type
                 end
               end
               def test_autocomplete_for_user
                 get :autocomplete_for_user, :id => 10, :q => 'smi', :format => 'js'
                 assert_response :success
                 assert_include 'John Smith', response.body
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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