meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

Merged r17153 to 3.4-stable (#26880).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17154 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2018-01-07 22:21:32 +00:00
parent c3da53217c
commit 721f3927bb
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/issues/_watchers_form.html.erb
View File

@ -1,4 +1,5 @@
<% if @issue.safe_attribute? 'watcher_user_ids' -%>
<%= hidden_field_tag 'issue[watcher_user_ids][]', '' %>
<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
<span id="watchers_inputs">
<%= watchers_checkboxes(@issue, users_for_new_issue_watchers(@issue)) %>

41
test/functional/issues_controller_test.rb
View File

@ -3860,6 +3860,7 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select 'input[type=checkbox][name=?][checked=checked]', 'issue[watcher_user_ids][]', 1
assert_select 'input[type=checkbox][name=?][checked=checked][value=?]', 'issue[watcher_user_ids][]', user.id.to_s
assert_select 'input[type=hidden][name=?][value=?]', 'issue[watcher_user_ids][]', '', 1
end
def test_new_as_copy_with_invalid_issue_should_respond_with_404
@ -4196,6 +4197,46 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_equal 1, issue.project_id
end
def test_create_as_copy_with_watcher_user_ids_should_copy_watchers
@request.session[:user_id] = 2
copied = Issue.generate!
copied.add_watcher User.find(2)
copied.add_watcher User.find(3)
assert_difference 'Issue.count' do
post :create, :params => {
:project_id => 1,
:copy_from => copied.id,
:issue => {
:subject => 'Copy cleared watchers',
:watcher_user_ids => ['', '3']
}
}
end
issue = Issue.order('id DESC').first
assert_equal [3], issue.watcher_user_ids
end
def test_create_as_copy_without_watcher_user_ids_should_not_copy_watchers
@request.session[:user_id] = 2
copied = Issue.generate!
copied.add_watcher User.find(2)
copied.add_watcher User.find(3)
assert_difference 'Issue.count' do
post :create, :params => {
:project_id => 1,
:copy_from => copied.id,
:issue => {
:subject => 'Copy cleared watchers',
:watcher_user_ids => ['']
}
}
end
issue = Issue.order('id DESC').first
assert_equal [], issue.watcher_user_ids
end
def test_get_edit
@request.session[:user_id] = 2
get :edit, :params => {