Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/groups_controller.rb.svn-base @ 511:107d36338b70 live
Merge from branch "cannam"
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:43:07 +0100 |
parents | cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/groups_controller.rb.svn-base Thu Jun 09 16:51:06 2011 +0100 +++ b/app/controllers/.svn/text-base/groups_controller.rb.svn-base Thu Jul 14 10:43:07 2011 +0100 @@ -132,7 +132,7 @@ 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