pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bug 78359

Browse Source
This commit is contained in:
Julia.Radzhabova
2025-11-13 16:06:54 +03:00
parent bce05e66cf
commit c645dedb82
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/main/lib/controller/History.js
View File

@ -202,7 +202,7 @@ define([
if (!opts.data || opts.data.error) { if (!opts.data || opts.data.error) {
var config = { var config = {
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: opts.data && opts.data.error ? opts.data.error : this.txtErrorLoadHistory, msg: opts.data && opts.data.error ? Common.Utils.String.htmlEncode(opts.data.error) : this.txtErrorLoadHistory,
iconCls: 'warn', iconCls: 'warn',
buttons: ['ok'] buttons: ['ok']
}; };

4
apps/documenteditor/main/app/controller/Main.js
View File

@ -613,7 +613,7 @@ define([
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('collaboration:sharingdeny'); Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
!old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, !old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : Common.Utils.String.htmlEncode(data.message),
target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true, target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true,
callback: function() { callback: function() {
me._state.lostEditingRights = false; me._state.lostEditingRights = false;
@ -705,7 +705,7 @@ define([
} }
Common.UI.alert({ Common.UI.alert({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory, msg: (opts.data.error) ? Common.Utils.String.htmlEncode(opts.data.error) : this.txtErrorLoadHistory,
iconCls: 'warn', iconCls: 'warn',
buttons: ['ok'], buttons: ['ok'],
callback: _.bind(function(btn){ callback: _.bind(function(btn){

2
apps/documenteditor/main/app/view/MailMergeSettings.js
View File

@ -634,7 +634,7 @@ define([
width: 500, width: 500,
closable: false, closable: false,
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: opts.data.error, msg: Common.Utils.String.htmlEncode(opts.data.error),
iconCls: 'warn', iconCls: 'warn',
buttons: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : [{value: 'custom', caption: this.textGoToMail}, 'cancel'], buttons: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : [{value: 'custom', caption: this.textGoToMail}, 'cancel'],
primary: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : 'custom', primary: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : 'custom',

2
apps/pdfeditor/main/app/controller/Main.js
View File

@ -542,7 +542,7 @@ define([
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('collaboration:sharingdeny'); Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
!old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, !old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : Common.Utils.String.htmlEncode(data.message),
target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true, target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true,
callback: function() { callback: function() {
me._state.lostEditingRights = false; me._state.lostEditingRights = false;

4
apps/presentationeditor/main/app/controller/Main.js
View File

@ -558,7 +558,7 @@ define([
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('collaboration:sharingdeny'); Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
!old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, !old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : Common.Utils.String.htmlEncode(data.message),
target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true, target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true,
callback: function() { callback: function() {
me._state.lostEditingRights = false; me._state.lostEditingRights = false;
@ -2832,7 +2832,7 @@ define([
} }
Common.UI.alert({ Common.UI.alert({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory, msg: (opts.data.error) ? Common.Utils.String.htmlEncode(opts.data.error) : this.txtErrorLoadHistory,
iconCls: 'warn', iconCls: 'warn',
buttons: ['ok'], buttons: ['ok'],
callback: _.bind(function(btn){ callback: _.bind(function(btn){

4
apps/spreadsheeteditor/main/app/controller/Main.js
View File

@ -634,7 +634,7 @@ define([
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('collaboration:sharingdeny'); Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
!old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, !old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : Common.Utils.String.htmlEncode(data.message),
target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true, target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true,
callback: function() { callback: function() {
me._state.lostEditingRights = false; me._state.lostEditingRights = false;
@ -3552,7 +3552,7 @@ define([
} }
Common.UI.alert({ Common.UI.alert({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory, msg: (opts.data.error) ? Common.Utils.String.htmlEncode(opts.data.error) : this.txtErrorLoadHistory,
iconCls: 'warn', iconCls: 'warn',
buttons: ['ok'], buttons: ['ok'],
callback: _.bind(function(btn){ callback: _.bind(function(btn){

2
apps/visioeditor/main/app/controller/Main.js
View File

@ -486,7 +486,7 @@ define([
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('collaboration:sharingdeny'); Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
!old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, !old_rights && Common.UI.TooltipManager.showTip({ step: 'changeRights', text: _.isEmpty(data.message) ? this.warnProcessRightsChange : Common.Utils.String.htmlEncode(data.message),
target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true, target: '#toolbar', maxwidth: 600, showButton: false, automove: true, noHighlight: true, noArrow: true, multiple: true,
callback: function() { callback: function() {
me._state.lostEditingRights = false; me._state.lostEditingRights = false;