FIX: improves locale support in tag-drop (#7418)
This commit is contained in:
parent
d4e788c136
commit
c99faa6b25
|
@ -11,7 +11,6 @@ export default ComboBoxComponent.extend(TagsMixin, {
|
||||||
verticalOffset: 3,
|
verticalOffset: 3,
|
||||||
value: Ember.computed.alias("tagId"),
|
value: Ember.computed.alias("tagId"),
|
||||||
headerComponent: "tag-drop/tag-drop-header",
|
headerComponent: "tag-drop/tag-drop-header",
|
||||||
rowComponent: "tag-drop/tag-drop-row",
|
|
||||||
allowAutoSelectFirst: false,
|
allowAutoSelectFirst: false,
|
||||||
tagName: "li",
|
tagName: "li",
|
||||||
showFilterByTag: Ember.computed.alias("siteSettings.show_filter_by_tag"),
|
showFilterByTag: Ember.computed.alias("siteSettings.show_filter_by_tag"),
|
||||||
|
@ -136,7 +135,10 @@ export default ComboBoxComponent.extend(TagsMixin, {
|
||||||
_transformJson(context, json) {
|
_transformJson(context, json) {
|
||||||
let results = json.results;
|
let results = json.results;
|
||||||
results = results.sort((a, b) => a.id > b.id);
|
results = results.sort((a, b) => a.id > b.id);
|
||||||
return results;
|
|
||||||
|
return results.map(r => {
|
||||||
|
return { id: r.id, name: r.text };
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
|
|
||||||
|
|
||||||
export default SelectKitRowComponent.extend({
|
|
||||||
layoutName: "select-kit/templates/components/tag-drop/tag-drop-row",
|
|
||||||
classNames: "tag-drop-row",
|
|
||||||
|
|
||||||
tagId: Ember.computed.alias("computedContent.value")
|
|
||||||
});
|
|
|
@ -1 +0,0 @@
|
||||||
{{tagId}}
|
|
|
@ -24,13 +24,13 @@ componentTest("default", {
|
||||||
if (params.queryParams.q === "rég") {
|
if (params.queryParams.q === "rég") {
|
||||||
return response({
|
return response({
|
||||||
"results": [
|
"results": [
|
||||||
{ "id": "régis", "name": "régis", "count": 2, "pm_count": 0 }
|
{ "id": "régis", "text": "régis", "count": 2, "pm_count": 0 }
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
}else if (params.queryParams.q === "dav") {
|
}else if (params.queryParams.q === "dav") {
|
||||||
return response({
|
return response({
|
||||||
"results": [
|
"results": [
|
||||||
{ "id": "David", "name": "David", "count": 2, "pm_count": 0 }
|
{ "id": "David", "text": "David", "count": 2, "pm_count": 0 }
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue