From bd929d9c9fcc233e346c5421cff3f7271c1fedde Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 15 Jan 2025 15:40:28 +0100
Subject: [PATCH 1/2] Fix task tag component [SCI-11460]

---
 app/assets/javascripts/my_modules.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js
index 586ca8b7d..36acbb10f 100644
--- a/app/assets/javascripts/my_modules.js
+++ b/app/assets/javascripts/my_modules.js
@@ -104,6 +104,7 @@
     dropdownSelector.init($(myModuleTagsSelector), {
       closeOnSelect: true,
       tagClass: 'my-module-white-tags',
+      labelHTML: true,
       tagStyle: (data) => {
         return `background: ${data.params.color}`;
       },
@@ -143,13 +144,14 @@
         } else if (lastTag.length > 0) {
           newTag = {
             tag: {
-              name: lastTag.find('.tag-label').html(),
+              name: lastTag.find('.tag-label').text(),
               project_id: selectElement.data('project-id'),
               color: null
             },
             my_module_id: selectElement.data('module-id'),
             simple_creation: true
           };
+
           $.post(selectElement.data('tags-create-url'), newTag, function(result) {
             dropdownSelector.removeValue(myModuleTagsSelector, 0, '', true);
             dropdownSelector.addValue(myModuleTagsSelector, {

From 4bc4a9a2b41c2c6c83b4f69cff1dd2a25ce34770 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 15 Jan 2025 15:41:04 +0100
Subject: [PATCH 2/2] Fix handling of '&' in quick search [SCI-11454]

---
 app/javascript/vue/navigation/quick_search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index f293f7362..d0b83a74e 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -328,7 +328,7 @@ export default {
         return;
       }
 
-      window.open(`${this.searchUrl}?q=${this.searchQuery}&teams[]=${this.currentTeam}&include_archived=true`, '_self');
+      window.open(`${this.searchUrl}?q=${encodeURIComponent(this.searchQuery)}&teams[]=${this.currentTeam}&include_archived=true`, '_self');
     },
     focusHistoryItem(event) {
       if (this.focusedHistoryItem === null && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {