meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-28 06:21:49 +00:00
Code Issues Releases Wiki Activity

Add watching users to a ticket should switch "watch" link to "unwatch" if own user was added (#15634).

Browse Source 
Patch by Takenori TAKAKI.


git-svn-id: http://svn.redmine.org/redmine/trunk@21079 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-07-25 02:27:54 +00:00
parent b509731965
commit 37d3f3faa9
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/watchers/create.js.erb
View File

@ -4,8 +4,6 @@ $('#ajax-modal').html(
:locals => {:watchables => @watchables, :users => @users})) %>');
<% if @watchables.size == 1 %>
$('#watchers').html(
'<%= escape_javascript(
render(:partial => 'watchers/watchers',
:locals => {:watched => @watchables.first})) %>');
<%= render(:partial => 'watchers/set_watcher',
:locals => {:watched => @watchables, :user => User.current}) %>
<% end %>

3
app/views/watchers/destroy.js.erb
View File

@ -1,3 +1,4 @@
<% if @watchables.size == 1 %>
$('#watchers').html('<%= escape_javascript(render(:partial => 'watchers/watchers', :locals => {:watched => @watchables.first})) %>');
<%= render(:partial => 'watchers/set_watcher',
:locals => {:watched => @watchables, :user => User.current}) %>
<% end %>

15
test/system/issues_test.rb
View File

@ -290,6 +290,21 @@ class IssuesSystemTest < ApplicationSystemTestCase
assert issue1.reload.watched_by?(jsmith)
end
def test_change_watch_or_unwatch_icon_from_sidebar
user = User.find(2)
log_user('jsmith', 'jsmith')
visit '/issues/1'
assert page.has_css?('#content .contextual .issue-1-watcher.icon-fav-off')
# add watcher 'jsmith' from sidebar
page.find('#watchers .contextual a', :text => 'Add').click
page.find('#users_for_watcher label', :text => 'John Smith').click
page.find('#new-watcher-form p.buttons input[type=submit]').click
assert page.has_css?('#content .contextual .issue-1-watcher.icon-fav')
# remove watcher 'jsmith' from sidebar
page.find('#watchers ul li.user-2 a.delete').click
assert page.has_css?('#content .contextual .issue-1-watcher.icon-fav-off')
end
def test_bulk_watch_issues_via_context_menu
log_user('jsmith', 'jsmith')
visit '/issues'