From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sat, 11 Nov 2023 07:10:51 +0000 (+0000)
Subject: Keep existing @##@ syntax when triggering an issue from the inline autocomplete ... 
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f028722d5a16f2b1c166fcb4181a7b8c98285ec;p=redmine.git

Keep existing @##@ syntax when triggering an issue from the inline autocomplete (#38852).

git-svn-id: https://svn.redmine.org/redmine/trunk@22419 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a183a2777..d39475d46 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1172,7 +1172,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 16a8ebdce..25d86fd6b 100644
--- a/test/system/inline_autocomplete_test.rb
+++ b/test/system/inline_autocomplete_test.rb
@@ -43,6 +43,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'