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

[SSE] asc_getSubtotalTop for pivot fields.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-04 17:09:58 +03:00
parent a00b65f56f
commit 31a9da234f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js
View file

@ -226,12 +226,13 @@ define([ 'text!spreadsheeteditor/main/app/template/FieldSettingsDialog.templa
_setDefaults: function (props) { _setDefaults: function (props) {
if (props) { if (props) {
var field = ((this.type == 0) ? props.asc_getColumnFields() : ((this.type == 1) ? props.asc_getRowFields() : props.asc_getPageFields()))[this.fieldIndex], var cache_names = props.asc_getCacheFields(),
cache_names = props.asc_getCacheFields(), field = props.asc_getPivotFields()[this.fieldIndex];
pivot_names = props.asc_getPivotFields();
this.lblSourceName.html(Common.Utils.String.htmlEncode(cache_names[field.asc_getIndex()].asc_getName())); this.lblSourceName.html(Common.Utils.String.htmlEncode(cache_names[this.fieldIndex].asc_getName()));
this.inputCustomName.setValue(Common.Utils.String.htmlEncode((pivot_names[field.asc_getIndex()] || cache_names[field.asc_getIndex()]).asc_getName())); this.inputCustomName.setValue(Common.Utils.String.htmlEncode((field || cache_names[this.fieldIndex]).asc_getName()));
(field.asc_getSubtotalTop()) ? this.radioTop.setValue(true) : this.radioBottom.setValue(true);
} }
}, },

2
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View file

@ -605,7 +605,7 @@ define([
(new SSE.Views.FieldSettingsDialog( (new SSE.Views.FieldSettingsDialog(
{ {
props: me._originalProps, props: me._originalProps,
fieldIndex: me._state.field.record.get('index'), fieldIndex: me._state.field.record.get('pivotIndex'),
names: me._state.names, names: me._state.names,
api: me.api, api: me.api,
type: me._state.field.type, type: me._state.field.type,