IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: forces boolean when content is only "true" && "false"

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-05-24 23:41:39 +02:00
committed by GitHub
parent 30fbf6fe81
commit 1be76d066c
6 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@
<div class="controls">
{{combo-box valueAttribute="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
{{#unless isDefaultSortOrder}}
{{combo-box valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
{{combo-box castBoolean=true valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
{{/unless}}
</div>
</section>

2
app/assets/javascripts/select-kit/components/multi-select.js.es6
View File

@@ -79,7 +79,7 @@ export default SelectKitComponent.extend({
shouldDisplayFilter() { return true; },
_beforeWillComputeValues(values) {
return values.map(v => this._castInteger(v === "" ? null : v));
return values.map(v => this._cast(v === "" ? null : v));
},
willComputeValues(values) { return values; },
computeValues(values) { return values; },

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

@@ -62,6 +62,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
horizontalOffset: 0,
fullWidthOnMobile: false,
castInteger: false,
castBoolean: false,
allowAny: false,
allowInitialValueMutation: false,
content: null,
@@ -169,7 +170,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
}
let computedContentItem = {
value: this._castInteger(this.valueForContentItem(contentItem)),
value: this._cast(this.valueForContentItem(contentItem)),
name: name || this._nameForContent(contentItem),
locked: false,
created: options.created || false,

2
app/assets/javascripts/select-kit/components/single-select.js.es6
View File

@@ -63,7 +63,7 @@ export default SelectKitComponent.extend({
switch (typeof value) {
case "string":
case "number":
return this._castInteger(value === "" ? null : value);
return this._cast(value === "" ? null : value);
default:
return value;
}

13
app/assets/javascripts/select-kit/mixins/utils.js.es6
View File

@@ -27,6 +27,19 @@ export default Ember.Mixin.create({
return !isNaN(parseFloat(input)) && isFinite(input);
},
_cast(value) {
if (value === this.noneValue) return value;
return this._castInteger(this._castBoolean(value));
},
_castBoolean(value) {
if (this.get("castBoolean") && Ember.isPresent(value) && typeof(value) === "string") {
return value === "true";
}
return value;
},
_castInteger(value) {
if (this.get("castInteger") && Ember.isPresent(value) && this._isNumeric(value)) {
return parseInt(value, 10);