Merge branch '25312-search-input-cmd-click-issue' into 'master'

Prevent removal of input that is the parent dropdown element

Closes #25312

See merge request !8397

1 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/search_autocomplete.js.es6 b/app/assets/javascripts/search_autocomplete.js.es6
index 480755899fb..6250e75d407 100644
--- a/app/assets/javascripts/search_autocomplete.js.es6
+++ b/app/assets/javascripts/search_autocomplete.js.es6
@@ -69,12 +69,17 @@
         search: {
           fields: ['text']
         },
+        id: this.getSearchText,
         data: this.getData.bind(this),
         selectable: true,
         clicked: this.onClick.bind(this)
       });
     }
 
+    getSearchText(selectedObject, el) {
+      return selectedObject.id ? selectedObject.text : '';
+    }
+
     getData(term, callback) {
       var _this, contents, jqXHR;
       _this = this;
@@ -364,7 +369,7 @@
 
     onClick(item, $el, e) {
       if (location.pathname.indexOf(item.url) !== -1) {
-        e.preventDefault();
+        if (!e.metaKey) e.preventDefault();
         if (!this.badgePresent) {
           if (item.category === 'Projects') {
             this.projectInputEl.val(item.id);