From 4fc37e12a0fb2c13efb9403e29be9714efb7f46f Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Mon, 1 Jun 2020 18:41:58 +0200 Subject: [PATCH] Fix dropdown render for columns manage modal --- app/assets/javascripts/repository_columns/index.js | 3 ++- app/assets/javascripts/sitewide/dropdown_selector.js | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js index e6f270bbc..a66a465ea 100644 --- a/app/assets/javascripts/repository_columns/index.js +++ b/app/assets/javascripts/repository_columns/index.js @@ -163,7 +163,8 @@ var RepositoryColumns = (function() { optionLabel: delimiterOptionsRender, tagClass: 'delimiter-icon-dropdown', tagLabel: delimiterOptionsRender, - disableSearch: true + disableSearch: true, + labelHTML: true }; $.get(modalUrl, (data) => { $manageModal.find('.modal-content').html(data.html) diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js index 5c8ec39c6..4f204a85a 100644 --- a/app/assets/javascripts/sitewide/dropdown_selector.js +++ b/app/assets/javascripts/sitewide/dropdown_selector.js @@ -42,6 +42,7 @@ closeOnSelect: boolean, // Close dropdown after select disableSearch: boolean, // Disable search emptyOptionAjax: boolean, // Add empty option for ajax request + labelHTML: bolean, // render as HTMLelement or text } @@ -635,7 +636,15 @@ var dropdownSelector = (function() { `).insertBefore(container.find('.input-field .search-field')); - tag.find('.tag-label').text(label); + + console.log(selector.data('config').labelHTML); + + if (selector.data('config').labelHTML) { + tag.find('.tag-label').html(label); + } else { + tag.find('.tag-label').text(label); + } + // Now we need add delete action to tag tag.find('.fa-times').click(function(e) { var tagLabel = $(this).prev();