scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-28 15:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix dropdown render for columns manage modal

Browse source
This commit is contained in:
Urban Rotnik 2020-06-01 18:41:58 +02:00
parent 26bdabb0c3
commit 4fc37e12a0
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/repository_columns/index.js
View file

@ -163,7 +163,8 @@ var RepositoryColumns = (function() {
optionLabel: delimiterOptionsRender, optionLabel: delimiterOptionsRender,
tagClass: 'delimiter-icon-dropdown', tagClass: 'delimiter-icon-dropdown',
tagLabel: delimiterOptionsRender, tagLabel: delimiterOptionsRender,
disableSearch: true disableSearch: true,
labelHTML: true
}; };
$.get(modalUrl, (data) => { $.get(modalUrl, (data) => {
$manageModal.find('.modal-content').html(data.html) $manageModal.find('.modal-content').html(data.html)

9
app/assets/javascripts/sitewide/dropdown_selector.js
View file

@ -42,6 +42,7 @@
closeOnSelect: boolean, // Close dropdown after select closeOnSelect: boolean, // Close dropdown after select
disableSearch: boolean, // Disable search disableSearch: boolean, // Disable search
emptyOptionAjax: boolean, // Add empty option for ajax request emptyOptionAjax: boolean, // Add empty option for ajax request
labelHTML: bolean, // render as HTMLelement or text
} }
@ -635,7 +636,15 @@ var dropdownSelector = (function() {
</div> </div>
<i class="fas fa-times ${selector.data('config').singleSelect ? 'hidden' : ''}"></i> <i class="fas fa-times ${selector.data('config').singleSelect ? 'hidden' : ''}"></i>
</div>`).insertBefore(container.find('.input-field .search-field')); </div>`).insertBefore(container.find('.input-field .search-field'));
console.log(selector.data('config').labelHTML);
if (selector.data('config').labelHTML) {
tag.find('.tag-label').html(label);
} else {
tag.find('.tag-label').text(label); tag.find('.tag-label').text(label);
}
// Now we need add delete action to tag // Now we need add delete action to tag
tag.find('.fa-times').click(function(e) { tag.find('.fa-times').click(function(e) {
var tagLabel = $(this).prev(); var tagLabel = $(this).prev();