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

[DE] Fix Bug 43460 (#261)

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-06 11:07:56 +03:00 committed by Alexey Golubev
parent 4196914962
commit 3308662a1d
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/controller/History.js
View file

@ -81,6 +81,7 @@ define([
}, },
setMode: function(mode) { setMode: function(mode) {
this.mode = mode;
if (!mode.canHistoryClose) { if (!mode.canHistoryClose) {
this.panelHistory.$el.find('#history-header').hide(); this.panelHistory.$el.find('#history-header').hide();
this.panelHistory.$el.find('#history-list').css('padding-top', 0); this.panelHistory.$el.find('#history-list').css('padding-top', 0);
@ -163,6 +164,8 @@ define([
}, },
onSetHistoryData: function(opts) { onSetHistoryData: function(opts) {
if (!this.mode.canUseHistory) return;
if (opts.data.error) { if (opts.data.error) {
var config = { var config = {
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -487,6 +487,8 @@ define([
}, },
onRefreshHistory: function(opts) { onRefreshHistory: function(opts) {
if (!this.appOptions.canUseHistory) return;
this.loadMask && this.loadMask.hide(); this.loadMask && this.loadMask.hide();
if (opts.data.error || !opts.data.history) { if (opts.data.error || !opts.data.history) {
var historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions'); var historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions');