cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [genericTemplates:filters] Custom tags (such as negated and like) are correctly parsed and added to the picker

pull/72/head
mokaddem 2021-08-31 11:19:15 +02:00
parent a4535ea42e
commit e835810406
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/genericTemplates/filters.php
View File

@ -104,7 +104,10 @@ echo $this->Bootstrap->modal([
$select = $filteringTable.closest('.modal-body').find('select.tag-input') $select = $filteringTable.closest('.modal-body').find('select.tag-input')
let passedTags = [] let passedTags = []
tags.forEach(tagname => { tags.forEach(tagname => {
if (!$select.find("option[value='" + tagname + "']")) { const existingOption = $select.find('option').filter(function() {
return $(this).val() === tagname
})
if (existingOption.length == 0) {
passedTags.push(new Option(tagname, tagname, true, true)) passedTags.push(new Option(tagname, tagname, true, true))
} }
}) })

17
webroot/js/main.js
View File

@ -213,13 +213,24 @@ function initSelect2Pickers() {
function initSelect2Picker($select) { function initSelect2Picker($select) {
function templateTag(state) { function templateTag(state, $select) {
if (!state.id) { if (!state.id) {
return state.label; return state.label;
} }
if (state.colour === undefined) { if (state.colour === undefined) {
state.colour = $(state.element).data('colour') state.colour = $(state.element).data('colour')
} }
if ($select !== undefined && state.text[0] === '!') {
// fetch corresponding tag and set colors?
// const baseTag = state.text.slice(1)
// const existingBaseTag = $select.find('option').filter(function() {
// return $(this).val() === baseTag
// })
// if (existingBaseTag.length > 0) {
// state.colour = existingBaseTag.data('colour')
// state.text = baseTag
// }
}
return HtmlHelper.tag(state) return HtmlHelper.tag(state)
} }
@ -227,8 +238,8 @@ function initSelect2Picker($select) {
placeholder: 'Pick a tag', placeholder: 'Pick a tag',
tags: true, tags: true,
width: '100%', width: '100%',
templateResult: templateTag, templateResult: (state) => templateTag(state),
templateSelection: templateTag, templateSelection: (state) => templateTag(state, $select),
}) })
} }