github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 15:25:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: prevents error when loading tag groups (#8983)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-02-17 10:39:04 +01:00 committed by GitHub
parent d827430ea6
commit 9feace3388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
View File

@ -2,12 +2,14 @@
<label for="category-allowed-tags">{{i18n 'category.tags_allowed_tags'}}</label>
{{tag-chooser
id="category-allowed-tags"
filterPlaceholder="category.tags_placeholder"
tags=category.allowed_tags
everyTag=true
excludeSynonyms=true
unlimitedTagCount=true
onChange=(action (mut category.allowed_tags))
options=(hash
filterPlaceholder="category.tags_placeholder"
)
}}
</section>
@ -45,8 +47,10 @@
{{tag-group-chooser
id="category-required-tag-group"
tagGroups=category.required_tag_groups
maximum=1
filterPlaceholder="category.tag_group_selector_placeholder"
options=(hash
maximum=1
filterPlaceholder="category.tag_group_selector_placeholder"
)
}}
</section>
</section>

2
app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
View File

@ -47,7 +47,7 @@ export default MultiSelectComponent.extend(TagsMixin, {
).then(results => {
if (results && results.length) {
return results.filter(r => {
return !this.tagGroups.includes(this.getValue(r));
return !makeArray(this.tagGroups).includes(this.getValue(r));
});
}
});