diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index 66f17f8a3..f3d67c442 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -162,7 +162,8 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', headers: props.asc_getHasHeaders(), // sensitive: props.asc_getCaseSensitive(), sortcol: props.asc_getColumnSort(), - infilter: !!props.asc_getFilterInside() + lockHeaders: !!props.asc_getLockChangeHeaders(), + lockOrientation: !!props.asc_getLockChangeOrientation() }; this.lblColumn.text(props.asc_getColumnSort() ? this.textColumn : this.textRow); diff --git a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js index 471837f72..7fb804652 100644 --- a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js @@ -117,7 +117,7 @@ define([ labelText: this.textTopBottom, name: 'asc-radio-sort-orient' }).on('change', _.bind(function(field, newValue, eOpts) { - newValue && this.chHeaders.setDisabled(this.props.infilter); + newValue && this.chHeaders.setDisabled(this.props.lockHeaders); }, this)); this.radioLeft = new Common.UI.RadioBox({ @@ -139,13 +139,13 @@ define([ if (props) { this.chHeaders.setValue(props.headers); this.chCase.setValue(props.sensitive); - (props.sortcol || props.infilter) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true); - this.radioLeft.setDisabled(props.infilter); + (props.sortcol || props.lockOrientation) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true); + this.radioLeft.setDisabled(props.lockOrientation); } }, getSettings: function () { - return {headers: this.radioTop.getValue() && (this.chHeaders.getValue()=='checked'), sensitive: this.chCase.getValue()=='checked', sortcol: this.radioTop.getValue(), infilter: this.props.infilter}; + return {headers: this.radioTop.getValue() && (this.chHeaders.getValue()=='checked'), sensitive: this.chCase.getValue()=='checked', sortcol: this.radioTop.getValue(), lockHeaders: this.props.lockHeaders, lockOrientation: this.props.lockOrientation}; }, textTitle: 'Sort Options',