jro_apps/redmine Commit - r5164:b972b5a647ca

Fixed: list of users for adding to a group may be empty if 100 first users have been added (#8029)....

Jean-Philippe Lang -

r5164:b972b5a647ca

parent child

Context file:

r5164:b972b5a647ca

app/controllers/groups_controller.rb +1 -1

               def autocomplete_for_user
                 @group = Group.find(params[:id])
-                @users = User.active.like(params[:q]).find(:all, :limit => 100) - @group.users
+                @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
                 render :layout => false
               end

app/models/user.rb +4 0

                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 { :conditions => ["#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id] }
               }
+              named_scope :not_in_group, lambda {|group|
+                group_id = group.is_a?(Group) ? group.id : group.to_i
+                { :conditions => ["#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id] }
+              }
               def before_create
                 self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?

app/views/groups/_users.html.erb +1 -1

             </div>
             <div class="splitcontentright">
-            <% users = User.active.find(:all, :limit => 100) - @group.users %>
+            <% users = User.active.not_in_group(@group).all(:limit => 100) %>
             <% if users.any? %>
               <% remote_form_for(:group, @group, :url => {:controller => 'groups', :action => 'add_users', :id => @group}, :method => :post) do |f| %>
                 <fieldset><legend><%=l(:label_user_new)%></legend>

test/functional/groups_controller_test.rb +9 0

@@ -104,4 +104,13 class GroupsControllerTest < ActionController::TestCase
104	post :destroy_membership, :id => 10, :membership_id => 6	104	post :destroy_membership, :id => 10, :membership_id => 6
105	end	105	end
106	end	106	end
		107
		108	def test_autocomplete_for_user
		109	get :autocomplete_for_user, :id => 10, :q => 'mis'
		110	assert_response :success
		111	users = assigns(:users)
		112	assert_not_nil users
		113	assert users.any?
		114	assert !users.include?(Group.find(10).users.first)
		115	end
107	end	116	end

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