<%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %> + :html => {:id => 'new-watcher-form', :style => 'display:none;'}) do |f| %> + <% users = User.active.find(:all, :limit => 25) - watched.watcher_users %> +
<%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil, :style => "width:98%;" %>
+ <%= observe_field(:user_search, + :frequency => 0.5, + :update => :users, + :url => auto_complete_users_path(:remove_watchers => watched.id, :klass => watched.class), + :with => 'q') + %> + +<%= submit_tag l(:button_add) %> <%= toggle_link l(:button_cancel), 'new-watcher-form'%>
<% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 89fb761c..f012ce2a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,6 +87,7 @@ ActionController::Routing::Routes.draw do |map| # Misc issue routes. TODO: move into resources map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues' + map.auto_complete_users '/users/auto_complete', :controller => 'auto_completes', :action => 'users' map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues' map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index' diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb index 88ed0f1e..4ee6482d 100644 --- a/test/functional/auto_completes_controller_test.rb +++ b/test/functional/auto_completes_controller_test.rb @@ -63,4 +63,69 @@ class AutoCompletesControllerTest < ActionController::TestCase assert_response :success assert_equal [], assigns(:issues) end + + context "GET :users" do + setup do + @login = User.generate!(:login => 'Acomplete') + @firstname = User.generate!(:firstname => 'Complete') + @lastname = User.generate!(:lastname => 'Complete') + @none = User.generate!(:login => 'hello', :firstname => 'ABC', :lastname => 'DEF') + @inactive = User.generate!(:firstname => 'Complete', :status => User::STATUS_LOCKED) + end + + context "with no restrictions" do + setup do + get :users, :q => 'complete' + end + + should_respond_with :success + + should "render a list of matching users in checkboxes" do + assert_select "input[type=checkbox][value=?]", @login.id + assert_select "input[type=checkbox][value=?]", @firstname.id + assert_select "input[type=checkbox][value=?]", @lastname.id + assert_select "input[type=checkbox][value=?]", @none.id, :count => 0 + end + + should "only show active users" do + assert_select "input[type=checkbox][value=?]", @inactive.id, :count => 0 + end + end + + context "restrict by removing group members" do + setup do + @group = Group.first + @group.users << @login + @group.users << @firstname + get :users, :q => 'complete', :remove_group_members => @group.id + end + + should_respond_with :success + + should "not include existing members of the Group" do + assert_select "input[type=checkbox][value=?]", @lastname.id + + assert_select "input[type=checkbox][value=?]", @login.id, :count => 0 + assert_select "input[type=checkbox][value=?]", @firstname.id, :count => 0 + end + end + + context "restrict by removing issue watchers" do + setup do + @issue = Issue.find(2) + @issue.add_watcher(@login) + @issue.add_watcher(@firstname) + get :users, :q => 'complete', :remove_watchers => @issue.id, :klass => 'Issue' + end + + should_respond_with :success + + should "not include existing watchers" do + assert_select "input[type=checkbox][value=?]", @lastname.id + + assert_select "input[type=checkbox][value=?]", @login.id, :count => 0 + assert_select "input[type=checkbox][value=?]", @firstname.id, :count => 0 + end + end + end end diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb index da656e06..c123c48b 100644 --- a/test/functional/groups_controller_test.rb +++ b/test/functional/groups_controller_test.rb @@ -100,13 +100,4 @@ class GroupsControllerTest < ActionController::TestCase post :destroy_membership, :id => 10, :membership_id => 6 end end - - def test_autocomplete_for_user - get :autocomplete_for_user, :id => 10, :q => 'mis' - assert_response :success - users = assigns(:users) - assert_not_nil users - assert users.any? - assert !users.include?(Group.find(10).users.first) - end end diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb index 7023908f..858e807e 100644 --- a/test/functional/watchers_controller_test.rb +++ b/test/functional/watchers_controller_test.rb @@ -114,13 +114,24 @@ class WatchersControllerTest < ActionController::TestCase def test_new_watcher @request.session[:user_id] = 2 assert_difference('Watcher.count') do - xhr :post, :new, :object_type => 'issue', :object_id => '2', :watcher => {:user_id => '4'} + xhr :post, :new, :object_type => 'issue', :object_id => '2', :user_ids => ['4'] assert_response :success assert_select_rjs :replace_html, 'watchers' end assert Issue.find(2).watched_by?(User.find(4)) end + def test_new_multiple_users + @request.session[:user_id] = 2 + assert_difference('Watcher.count', 2) do + xhr :post, :new, :object_type => 'issue', :object_id => '2', :user_ids => ['4','7'] + assert_response :success + assert_select_rjs :replace_html, 'watchers' + end + assert Issue.find(2).watched_by?(User.find(4)) + assert Issue.find(2).watched_by?(User.find(7)) + end + def test_remove_watcher @request.session[:user_id] = 2 assert_difference('Watcher.count', -1) do diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 6ae25c47..dc9f0532 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -346,4 +346,9 @@ class RoutingTest < ActionController::IntegrationTest context "administration panel" do should_route :get, "/admin/projects", :controller => 'admin', :action => 'projects' end + + context "auto_completes" do + should_route :get, "/users/auto_complete", :controller => 'auto_completes', :action => 'users' + end + end diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index 43dd1a92..b2b16f9a 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -89,6 +89,15 @@ class MemberTest < ActiveSupport::TestCase @member.destroy end end + + should "not prune watchers if the user still has permission to watch as a non-member" do + @member_on_public_project = Member.create!(:project => Project.find(1), :principal => User.find(9), :role_ids => [1, 2]) + + assert_no_difference 'Watcher.count' do + @member_on_public_project.destroy + end + end + end context "by updating roles" do