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

[SSE] Fix Bug 36982 + disable cut/paste/insert function from context menu in the pivot table.

Browse source
This commit is contained in:
Julia Radzhabova 2018-03-20 15:35:17 +03:00
parent fe68423a70
commit 107a2b377e
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1475,6 +1475,8 @@ define([
item.setDisabled(isCellLocked); item.setDisabled(isCellLocked);
}); });
documentHolder.pmiCopy.setDisabled(false); documentHolder.pmiCopy.setDisabled(false);
documentHolder.pmiCut.setDisabled(isCellLocked || inPivot); // can't edit pivot cells
documentHolder.pmiPaste.setDisabled(isCellLocked || inPivot);
documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked); documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked || inPivot); documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked || inPivot);
documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked); documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked);
@ -1487,6 +1489,7 @@ define([
documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true)); documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true));
documentHolder.menuHyperlink.setDisabled(isCellLocked || inPivot); documentHolder.menuHyperlink.setDisabled(isCellLocked || inPivot);
documentHolder.menuAddHyperlink.setDisabled(isCellLocked || inPivot); documentHolder.menuAddHyperlink.setDisabled(isCellLocked || inPivot);
documentHolder.pmiInsFunction.setDisabled(isCellLocked || inPivot);
if (showMenu) this.showPopupMenu(documentHolder.ssMenu, {}, event); if (showMenu) this.showPopupMenu(documentHolder.ssMenu, {}, event);
} else if (this.permissions.isEditDiagram && seltype == Asc.c_oAscSelectionType.RangeChartText) { } else if (this.permissions.isEditDiagram && seltype == Asc.c_oAscSelectionType.RangeChartText) {

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

@ -328,9 +328,7 @@ define([
var selectType = info.asc_getFlags().asc_getSelectionType(), var selectType = info.asc_getFlags().asc_getSelectionType(),
pivotInfo = info.asc_getPivotTableInfo(); pivotInfo = info.asc_getPivotTableInfo();
var need_disable = info.asc_getLocked(); this.view.SetDisabled(!pivotInfo || info.asc_getLockedPivotTable());
this.view.SetDisabled(!pivotInfo);
if (pivotInfo) if (pivotInfo)
this.ChangeSettings(pivotInfo); this.ChangeSettings(pivotInfo);
}, },

9
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -133,12 +133,13 @@ define([
var need_disable = info.asc_getLocked(), var need_disable = info.asc_getLocked(),
need_disable_table = (info.asc_getLockedTable()===true || !this.rightmenu.mode.canModifyFilter), need_disable_table = (info.asc_getLockedTable()===true || !this.rightmenu.mode.canModifyFilter),
need_disable_spark = (info.asc_getLockedSparkline()===true); need_disable_spark = (info.asc_getLockedSparkline()===true),
need_disable_pivot = (info.asc_getLockedPivotTable()===true);
this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, pivotInfo, need_disable, need_disable_table, need_disable_spark); this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, pivotInfo, need_disable, need_disable_table, need_disable_spark, need_disable_pivot);
}, },
onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, pivotInfo, isCellLocked, isTableLocked, isSparkLocked) { onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, pivotInfo, isCellLocked, isTableLocked, isSparkLocked, isPivotLocked) {
if (!this.editMode) if (!this.editMode)
return; return;
@ -199,7 +200,7 @@ define([
// if (pivotInfo) { // if (pivotInfo) {
// settingsType = Common.Utils.documentSettingsType.Pivot; // settingsType = Common.Utils.documentSettingsType.Pivot;
// this._settings[settingsType].props = pivotInfo; // this._settings[settingsType].props = pivotInfo;
// this._settings[settingsType].locked = isCellLocked || true; // disable pivot settings // this._settings[settingsType].locked = isPivotLocked || true; // disable pivot settings
// this._settings[settingsType].hidden = 0; // this._settings[settingsType].hidden = 0;
// } // }