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

[SSE] Use asc_getLockedTable() instead of cellinfo.asc_getLocked() for detecting if the table is locked.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-24 10:23:02 +03:00
parent 0c9a6d4ff1
commit 24e1663035
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1141,6 +1141,7 @@ define([
documentHolder = this.documentHolder, documentHolder = this.documentHolder,
seltype = cellinfo.asc_getFlags().asc_getSelectionType(), seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
isCellLocked = cellinfo.asc_getLocked(), isCellLocked = cellinfo.asc_getLocked(),
isTableLocked = cellinfo.asc_getLockedTable()===true,
isObjLocked = false, isObjLocked = false,
commentsController = this.getApplication().getController('Common.Controllers.Comments'), commentsController = this.getApplication().getController('Common.Controllers.Comments'),
insfunc = false, insfunc = false,
@ -1341,9 +1342,15 @@ define([
item.setDisabled(isCellLocked); item.setDisabled(isCellLocked);
}); });
documentHolder.pmiCopy.setDisabled(false); documentHolder.pmiCopy.setDisabled(false);
documentHolder.pmiFilterCells.setDisabled(isCellLocked || (filterInfo==null)); documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiSortCells.setDisabled(isCellLocked || (filterInfo==null)); documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiReapply.setDisabled(isCellLocked || (isApplyAutoFilter!==true)); documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiDeleteEntire.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiDeleteCells.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiDeleteTable.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiFilterCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null));
documentHolder.pmiSortCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null));
documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true));
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) {
if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return; if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return;

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

@ -121,9 +121,10 @@ define([
this._openRightMenu = true; this._openRightMenu = true;
} }
var need_disable = info.asc_getLocked(); var need_disable = info.asc_getLocked(),
need_disable_table = (info.asc_getLockedTable()===true);
this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable); this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable, need_disable_table);
if (this._state.prevDisabled != need_disable) { if (this._state.prevDisabled != need_disable) {
this._state.prevDisabled = need_disable; this._state.prevDisabled = need_disable;
@ -133,7 +134,7 @@ define([
} }
}, },
onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked) { onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked, isTableLocked) {
if (!this.editMode) if (!this.editMode)
return; return;
@ -174,7 +175,7 @@ define([
if (formatTableInfo) { if (formatTableInfo) {
settingsType = Common.Utils.documentSettingsType.Table; settingsType = Common.Utils.documentSettingsType.Table;
this._settings[settingsType].props = formatTableInfo; this._settings[settingsType].props = formatTableInfo;
this._settings[settingsType].locked = isCellLocked; this._settings[settingsType].locked = isTableLocked;
this._settings[settingsType].hidden = 0; this._settings[settingsType].hidden = 0;
} }

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1604,7 +1604,7 @@ define([
if (!this.editMode) return; if (!this.editMode) return;
var selectionType = info.asc_getFlags().asc_getSelectionType(), var selectionType = info.asc_getFlags().asc_getSelectionType(),
coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false, coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true || info.asc_getLockedTable()===true) : false,
editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable), editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable),
me = this, me = this,
toolbar = this.toolbar, toolbar = this.toolbar,