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

[SSE] Bug 45989

Browse source
This commit is contained in:
Julia Radzhabova 2020-09-08 17:36:55 +03:00
parent a298d8f28b
commit 4876101c86
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/spreadsheeteditor/main/app/controller/PivotTable.js
View file

@ -386,6 +386,7 @@ define([
var pivotInfo = info.asc_getPivotTableInfo(); var pivotInfo = info.asc_getPivotTableInfo();
Common.Utils.lockControls(SSE.enumLock.noPivot, !pivotInfo, {array: this.view.lockedControls}); Common.Utils.lockControls(SSE.enumLock.noPivot, !pivotInfo, {array: this.view.lockedControls});
Common.Utils.lockControls(SSE.enumLock.pivotLock, pivotInfo && (info.asc_getLockedPivotTable()===true), {array: this.view.lockedControls});
Common.Utils.lockControls(SSE.enumLock.editPivot, !!pivotInfo, {array: [this.view.btnAddPivot]}); Common.Utils.lockControls(SSE.enumLock.editPivot, !!pivotInfo, {array: [this.view.btnAddPivot]});
if (pivotInfo) if (pivotInfo)

22
apps/spreadsheeteditor/main/app/view/PivotTable.js
View file

@ -156,25 +156,25 @@ define([
this.chRowHeader = new Common.UI.CheckBox({ this.chRowHeader = new Common.UI.CheckBox({
labelText: this.textRowHeader, labelText: this.textRowHeader,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock]
}); });
this.lockedControls.push(this.chRowHeader); this.lockedControls.push(this.chRowHeader);
this.chColHeader = new Common.UI.CheckBox({ this.chColHeader = new Common.UI.CheckBox({
labelText: this.textColHeader, labelText: this.textColHeader,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock]
}); });
this.lockedControls.push(this.chColHeader); this.lockedControls.push(this.chColHeader);
this.chRowBanded = new Common.UI.CheckBox({ this.chRowBanded = new Common.UI.CheckBox({
labelText: this.textRowBanded, labelText: this.textRowBanded,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock]
}); });
this.lockedControls.push(this.chRowBanded); this.lockedControls.push(this.chRowBanded);
this.chColBanded = new Common.UI.CheckBox({ this.chColBanded = new Common.UI.CheckBox({
labelText: this.textColBanded, labelText: this.textColBanded,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock]
}); });
this.lockedControls.push(this.chColBanded); this.lockedControls.push(this.chColBanded);
@ -191,7 +191,7 @@ define([
iconCls : 'toolbar__icon btn-pivot-layout', iconCls : 'toolbar__icon btn-pivot-layout',
caption : this.capLayout, caption : this.capLayout,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true
}); });
this.lockedControls.push(this.btnPivotLayout); this.lockedControls.push(this.btnPivotLayout);
@ -201,7 +201,7 @@ define([
iconCls : 'toolbar__icon btn-blank-rows', iconCls : 'toolbar__icon btn-blank-rows',
caption : this.capBlankRows, caption : this.capBlankRows,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true
}); });
this.lockedControls.push(this.btnPivotBlankRows); this.lockedControls.push(this.btnPivotBlankRows);
@ -211,7 +211,7 @@ define([
iconCls : 'toolbar__icon btn-subtotals', iconCls : 'toolbar__icon btn-subtotals',
caption : this.capSubtotals, caption : this.capSubtotals,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true
}); });
this.lockedControls.push(this.btnPivotSubtotals); this.lockedControls.push(this.btnPivotSubtotals);
@ -221,7 +221,7 @@ define([
iconCls : 'toolbar__icon btn-grand-totals', iconCls : 'toolbar__icon btn-grand-totals',
caption : this.capGrandTotals, caption : this.capGrandTotals,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true
}); });
this.lockedControls.push(this.btnPivotGrandTotals); this.lockedControls.push(this.btnPivotGrandTotals);
@ -231,7 +231,7 @@ define([
iconCls: 'toolbar__icon btn-update', iconCls: 'toolbar__icon btn-update',
caption: this.txtRefresh, caption: this.txtRefresh,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock]
}); });
this.lockedControls.push(this.btnRefreshPivot); this.lockedControls.push(this.btnRefreshPivot);
@ -239,7 +239,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-select-pivot', iconCls: 'toolbar__icon btn-select-pivot',
caption: this.txtSelect, caption: this.txtSelect,
lock: [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock: [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock]
}); });
this.lockedControls.push(this.btnSelectPivot); this.lockedControls.push(this.btnSelectPivot);
@ -249,7 +249,7 @@ define([
itemWidth : 61, itemWidth : 61,
itemHeight : 49, itemHeight : 49,
menuMaxHeight : 300, menuMaxHeight : 300,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
beforeOpenHandler: function(e) { beforeOpenHandler: function(e) {
var cmp = this, var cmp = this,
menu = cmp.openButton.menu; menu = cmp.openButton.menu;

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

@ -95,7 +95,8 @@ define([
noSubitems: 'no-subitems', noSubitems: 'no-subitems',
noSlicerSource: 'no-slicer-source', noSlicerSource: 'no-slicer-source',
selSlicer: 'sel-slicer', selSlicer: 'sel-slicer',
cantSort: 'cant-sort' cantSort: 'cant-sort',
pivotLock: 'pivot-lock'
}; };
SSE.Views.Toolbar = Common.UI.Mixtbar.extend(_.extend({ SSE.Views.Toolbar = Common.UI.Mixtbar.extend(_.extend({