comparison 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
comparison
equal deleted inserted replaced
451:a9f6345cb43d 511:107d36338b70
130 end 130 end
131 end 131 end
132 132
133 def autocomplete_for_user 133 def autocomplete_for_user
134 @group = Group.find(params[:id]) 134 @group = Group.find(params[:id])
135 @users = User.active.like(params[:q]).find(:all, :limit => 100) - @group.users 135 @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
136 render :layout => false 136 render :layout => false
137 end 137 end
138 138
139 def edit_membership 139 def edit_membership
140 @group = Group.find(params[:id]) 140 @group = Group.find(params[:id])