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

[SSE] Bug 32310

Browse source
This commit is contained in:
Julia Radzhabova 2016-04-26 18:32:38 +03:00
parent fd1ba48d35
commit fafe53ac16
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,10 +117,9 @@ define([
this._openRightMenu = true;
}
this.onFocusObject(SelectedObjects, formatTableInfo);
var need_disable = info.asc_getLocked();
var need_disable = info.asc_getLocked(),
me = this;
this.onFocusObject(SelectedObjects, formatTableInfo, need_disable);
if (this._state.prevDisabled != need_disable) {
this._state.prevDisabled = need_disable;
@ -130,7 +129,7 @@ define([
}
},
onFocusObject: function(SelectedObjects, formatTableInfo) {
onFocusObject: function(SelectedObjects, formatTableInfo, isCellLocked) {
if (!this.editMode)
return;
@ -171,6 +170,7 @@ define([
if (formatTableInfo) {
settingsType = Common.Utils.documentSettingsType.Table;
this._settings[settingsType].props = formatTableInfo;
this._settings[settingsType].locked = isCellLocked;
this._settings[settingsType].hidden = 0;
}

4
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -328,8 +328,8 @@ define([
this.chFilter.setValue(value, true);
this._state.CheckFilter=value;
}
if (this.chFilter.isDisabled() == this._state.CheckHeader)
this.chFilter.setDisabled(!this._state.CheckHeader);
if (this.chFilter.isDisabled() !== (!this._state.CheckHeader || this._locked))
this.chFilter.setDisabled(!this._state.CheckHeader || this._locked);
if (needTablePictures)
this.onApiInitTableTemplates(this.api.asc_getTablePictures(props));