Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Change lock for sort options

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-22 17:46:48 +03:00
parent f6ad6e7307
commit 39f6b9123b
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/spreadsheeteditor/main/app/view/SortDialog.js
View file

@ -162,7 +162,8 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
headers: props.asc_getHasHeaders(), headers: props.asc_getHasHeaders(),
// sensitive: props.asc_getCaseSensitive(), // sensitive: props.asc_getCaseSensitive(),
sortcol: props.asc_getColumnSort(), 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); this.lblColumn.text(props.asc_getColumnSort() ? this.textColumn : this.textRow);

8
apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js
View file

@ -117,7 +117,7 @@ define([
labelText: this.textTopBottom, labelText: this.textTopBottom,
name: 'asc-radio-sort-orient' name: 'asc-radio-sort-orient'
}).on('change', _.bind(function(field, newValue, eOpts) { }).on('change', _.bind(function(field, newValue, eOpts) {
newValue && this.chHeaders.setDisabled(this.props.infilter); newValue && this.chHeaders.setDisabled(this.props.lockHeaders);
}, this)); }, this));
this.radioLeft = new Common.UI.RadioBox({ this.radioLeft = new Common.UI.RadioBox({
@ -139,13 +139,13 @@ define([
if (props) { if (props) {
this.chHeaders.setValue(props.headers); this.chHeaders.setValue(props.headers);
this.chCase.setValue(props.sensitive); this.chCase.setValue(props.sensitive);
(props.sortcol || props.infilter) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true); (props.sortcol || props.lockOrientation) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true);
this.radioLeft.setDisabled(props.infilter); this.radioLeft.setDisabled(props.lockOrientation);
} }
}, },
getSettings: function () { 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', textTitle: 'Sort Options',