kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Internal Error in watchers XHR search (#10600). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9323 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Etienne Massip 2012-04-05 18:10:54 +00:00
parent ddce7ef142
commit d36d64f664
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/watchers_controller.rb
View File

@ -98,7 +98,7 @@ class WatchersController < ApplicationController
def autocomplete_for_user
@users = User.active.like(params[:q]).find(:all, :limit => 100)
if @watched
@user -= @watched.watcher_users
@users -= @watched.watcher_users
end
render :layout => false
end

20
test/functional/watchers_controller_test.rb
View File

@ -98,6 +98,26 @@ class WatchersControllerTest < ActionController::TestCase
assert Issue.find(2).watched_by?(User.find(7))
end
def test_autocomplete_on_watchable_creation
xhr :get, :autocomplete_for_user, :q => 'mi'
assert_response :success
assert_select 'input', :count => 4
assert_select 'input[name=?][value=1]', 'watcher[user_ids][]'
assert_select 'input[name=?][value=2]', 'watcher[user_ids][]'
assert_select 'input[name=?][value=8]', 'watcher[user_ids][]'
assert_select 'input[name=?][value=9]', 'watcher[user_ids][]'
end
def test_autocomplete_on_watchable_update
xhr :get, :autocomplete_for_user, :q => 'mi', :object_id => '2' , :object_type => 'issue'
assert_response :success
assert_select 'input', :count => 3
assert_select 'input[name=?][value=2]', 'watcher[user_ids][]'
assert_select 'input[name=?][value=8]', 'watcher[user_ids][]'
assert_select 'input[name=?][value=9]', 'watcher[user_ids][]'
end
def test_append
@request.session[:user_id] = 2
assert_no_difference 'Watcher.count' do