github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-10 03:00:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: regression preventing addition of multiple tags in a group

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-04-02 17:54:40 +02:00 committed by GitHub
parent 16341219ab
commit a828da33aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
View File

@ -44,7 +44,7 @@ export default ComboBox.extend(Tags, {
@computed("tags") @computed("tags")
selection(tags) { selection(tags) {
return makeArray(tags); return makeArray(tags).map(c => this.computeContentItem(c));
}, },
filterComputedContent(computedContent) { filterComputedContent(computedContent) {
@ -125,7 +125,9 @@ export default ComboBox.extend(Tags, {
computeHeaderContent() { computeHeaderContent() {
let content = this._super(); let content = this._super();
const joinedTags = this.get("selection").join(", "); const joinedTags = this.get("selection")
.map(s => Ember.get(s, "value"))
.join(", ");
if (isEmpty(this.get("selection"))) { if (isEmpty(this.get("selection"))) {
content.label = I18n.t("tagging.choose_for_topic"); content.label = I18n.t("tagging.choose_for_topic");
@ -144,7 +146,13 @@ export default ComboBox.extend(Tags, {
limit: this.get("siteSettings.max_tag_search_results"), limit: this.get("siteSettings.max_tag_search_results"),
categoryId: this.get("categoryId") categoryId: this.get("categoryId")
}; };
if (this.get("selection")) data.selected_tags = this.get("selection").slice(0, 100);
if (this.get("selection")) {
data.selected_tags = this.get("selection")
.map(s => Ember.get(s, "value"))
.slice(0, 100);
}
if (!this.get("everyTag")) data.filterForInput = true; if (!this.get("everyTag")) data.filterForInput = true;
this.searchTags("/tags/filter/search", data, this._transformJson); this.searchTags("/tags/filter/search", data, this._transformJson);

3
app/assets/javascripts/select-kit/mixins/tags.js.es6
View File

@ -49,7 +49,8 @@ export default Ember.Mixin.create({
} }
const inCollection = this.get("collectionComputedContent").map(c => get(c, "id")).includes(term); const inCollection = this.get("collectionComputedContent").map(c => get(c, "id")).includes(term);
const inSelection = this.get("selection").map(s => s.toLowerCase()).includes(term);
const inSelection = this.get("selection").map(s => get(s, "value").toLowerCase()).includes(term);
if (inCollection || inSelection) { if (inCollection || inSelection) {
return false; return false;
} }