mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-11 03:33:07 +00:00
Merged r21834 and r21852 to 5.0-stable (#37369).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21853 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
cecbd9cd73
commit
337c5f93ba
@ -226,6 +226,10 @@
|
||||
%>
|
||||
<%= wikitoolbar_for 'notes' %>
|
||||
|
||||
<% if User.current.allowed_to?(:add_issue_watchers, nil, global: true)%>
|
||||
<%= update_data_sources_for_auto_complete({users: watchers_autocomplete_for_mention_path(q: '', object_type: 'issue', object_id: @issues.map(&:id) )}) %>
|
||||
<% end %>
|
||||
|
||||
<% if @safe_attributes.include?('private_notes') %>
|
||||
<label class="inline">
|
||||
<%= check_box_tag 'issue[private_notes]', 1, false %>
|
||||
|
||||
@ -186,4 +186,19 @@ class InlineAutocompleteSystemTest < ApplicationSystemTestCase
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def test_inline_autocomplete_for_users_on_issues_bulk_edit_show_autocomplete
|
||||
log_user('jsmith', 'jsmith')
|
||||
visit '/issues/bulk_edit?ids[]=1&ids[]=2'
|
||||
|
||||
find('#notes').click
|
||||
fill_in 'notes', :with => '@lopper'
|
||||
|
||||
within('.tribute-container') do
|
||||
assert page.has_text? 'Dave Lopper'
|
||||
first('li').click
|
||||
end
|
||||
|
||||
assert_equal '@dlopper ', find('#notes').value
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user