Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: ensures edit-category-setting is correctly casting boolean (#9999)

This commit is contained in:
Joffrey JAFFEUX 2020-06-08 15:16:42 +02:00 committed by GitHub
parent 472862e87d
commit cb13152a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/app/components/edit-category-settings.js
View File

@ -108,11 +108,18 @@ export default buildCategoryPanel("settings", {
.sort((a, b) => a.name.localeCompare(b.name)); .sort((a, b) => a.name.localeCompare(b.name));
}, },
@discourseComputed("category.sort_ascending")
sortAscendingOption(sortAscending) {
if (sortAscending === "false") return false;
if (sortAscending === "true") return true;
return sortAscending;
},
@discourseComputed @discourseComputed
sortAscendingOptions() { sortAscendingOptions() {
return [ return [
{ name: I18n.t("category.sort_ascending"), value: "true" }, { name: I18n.t("category.sort_ascending"), value: true },
{ name: I18n.t("category.sort_descending"), value: "false" } { name: I18n.t("category.sort_descending"), value: false }
]; ];
} }
}); });

16
app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
View File

@ -181,17 +181,25 @@
{{i18n "category.sort_order"}} {{i18n "category.sort_order"}}
</label> </label>
<div class="controls"> <div class="controls">
{{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}} {{combo-box
valueProperty="value"
content=availableSorts
value=category.sort_order
options=(hash
none="category.sort_options.default"
)
onChange=(action (mut category.sort_order))
}}
{{#unless isDefaultSortOrder}} {{#unless isDefaultSortOrder}}
{{combo-box {{combo-box
castBoolean=true
valueProperty="value" valueProperty="value"
content=sortAscendingOptions content=sortAscendingOptions
value=category.sort_ascending value=sortAscendingOption
none="category.sort_options.default"
options=(hash options=(hash
none="category.sort_options.default"
placementStrategy="absolute" placementStrategy="absolute"
) )
onChange=(action (mut category.sort_ascending))
}} }}
{{/unless}} {{/unless}}
</div> </div>