diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2023-11-12 11:07:53 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2023-11-12 11:07:53 +0000 |
| commit | 4d8748b6a4a38b5165e60be03a50db418c1f6b7c (patch) | |
| tree | 6c69dc59518e4dc20ba594376ea74f171a0c21c7 | |
| parent | 278b685bc8014cf6d4f46e96d42a16cfd270e095 (diff) | |
| download | redmine-4d8748b6a4a38b5165e60be03a50db418c1f6b7c.tar.gz redmine-4d8748b6a4a38b5165e60be03a50db418c1f6b7c.zip | |
Merged r22419 from trunk to 5.0-stable (#38852).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22426 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | public/javascripts/application.js | 7 | ||||
| -rw-r--r-- | test/system/inline_autocomplete_test.rb | 16 |
2 files changed, 22 insertions, 1 deletions
diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 7b2e7725e..dcebb0923 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1169,7 +1169,12 @@ function inlineAutoComplete(element) { fillAttr: 'label', requireLeadingSpace: true, selectTemplate: function (issue) { - return '#' + issue.original.id; + let leadingHash = "#" + // keep ## syntax which is a valid issue syntax to show issue with title. + if (this.currentMentionTextSnapshot.charAt(0) === "#") { + leadingHash = "##" + } + return leadingHash + issue.original.id; }, menuItemTemplate: function (issue) { return sanitizeHTML(issue.original.label); diff --git a/test/system/inline_autocomplete_test.rb b/test/system/inline_autocomplete_test.rb index dbae41373..7bf453e6d 100644 --- a/test/system/inline_autocomplete_test.rb +++ b/test/system/inline_autocomplete_test.rb @@ -42,6 +42,22 @@ class InlineAutocompleteSystemTest < ApplicationSystemTestCase assert_equal '#12 ', find('#issue_description').value end + def test_inline_autocomplete_for_issues_with_double_hash_keep_syntax + log_user('admin', 'admin') + visit 'projects/ecookbook/issues/new' + + fill_in 'Description', :with => '##Closed' + + within('.tribute-container') do + assert page.has_text? 'Bug #12: Closed issue on a locked version' + assert page.has_text? 'Bug #11: Closed issue on a closed version' + + first('li').click + end + + assert_equal '##12 ', find('#issue_description').value + end + def test_inline_autocomplete_filters_autocomplete_items log_user('jsmith', 'jsmith') visit 'issues/new' |