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

[SSE] Disable some sort settings for filter/table

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-01 17:08:30 +03:00
parent 4a8c147701
commit e71e4a74ba
2 changed files with 7 additions and 6 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

@ -156,7 +156,8 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
this.sortOptions = { this.sortOptions = {
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()
}; };
this.lblColumn.text(props.asc_getColumnSort() ? this.textColumn : this.textRow); this.lblColumn.text(props.asc_getColumnSort() ? this.textColumn : this.textRow);

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

@ -115,10 +115,9 @@ define([
this.radioTop = new Common.UI.RadioBox({ this.radioTop = new Common.UI.RadioBox({
el: $('#sort-options-radio-row'), el: $('#sort-options-radio-row'),
labelText: this.textTopBottom, labelText: this.textTopBottom,
name: 'asc-radio-sort-orient', name: 'asc-radio-sort-orient'
checked: true
}).on('change', _.bind(function(field, newValue, eOpts) { }).on('change', _.bind(function(field, newValue, eOpts) {
newValue && this.chHeaders.setDisabled(false); newValue && this.chHeaders.setDisabled(this.props.infilter);
}, this)); }, this));
this.radioLeft = new Common.UI.RadioBox({ this.radioLeft = new Common.UI.RadioBox({
@ -140,12 +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) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true); (props.sortcol || props.infilter) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true);
this.radioLeft.setDisabled(props.infilter);
} }
}, },
getSettings: function () { getSettings: function () {
return {headers: this.radioTop.getValue() && (this.chHeaders.getValue()=='checked'), sensitive: this.chCase.getValue()=='checked', sortcol: this.radioTop.getValue()}; return {headers: this.radioTop.getValue() && (this.chHeaders.getValue()=='checked'), sensitive: this.chCase.getValue()=='checked', sortcol: this.radioTop.getValue(), infilter: this.props.infilter};
}, },
textTitle: 'Sort Options', textTitle: 'Sort Options',