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

[SSE mobile] Fix Bug 48639

Browse source
This commit is contained in:
Julia Radzhabova 2021-02-13 18:56:17 +03:00
parent f3bf733cf6
commit a1bb6737dc
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -1135,6 +1135,11 @@ define([
config.msg = this.errorFrmlMaxReference; config.msg = this.errorFrmlMaxReference;
break; break;
case Asc.c_oAscError.ID.DataValidate:
errData && errData.asc_getErrorTitle() && (config.title = Common.Utils.String.htmlEncode(errData.asc_getErrorTitle()));
config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate;
break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1163,31 +1168,24 @@ define([
else { else {
Common.Gateway.reportWarning(id, config.msg); Common.Gateway.reportWarning(id, config.msg);
config.title = this.notcriticalErrorTitle; config.title = config.title || this.notcriticalErrorTitle;
// config.iconCls = 'warn';
// config.buttons = ['ok'];
config.callback = _.bind(function(btn){ config.callback = _.bind(function(btn){
if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && (this.appOptions.canDownload || this.appOptions.canDownloadOrigin)) { if (id == Asc.c_oAscError.ID.DataValidate) {
Common.UI.Menu.Manager.hideAll(); this.api.asc_closeCellEditor(true);
if (this.appOptions.isDesktopApp && this.appOptions.isOffline)
this.api.asc_DownloadAs();
else
(this.appOptions.canDownload) ? this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas') : this.api.asc_DownloadOrigin();
} }
this._state.lostEditingRights = false; this._state.lostEditingRights = false;
}, this); }, this);
} }
// Common.UI.alert(config); if (id == Asc.c_oAscError.ID.DataValidate) {
config.buttons = [{ text: 'OK' }, { text: this.textCancel, onClick: config.callback }];
} else {
config.buttons = [{ text: 'OK', onClick: config.callback }];
}
uiApp.modal({ uiApp.modal({
title : config.title, title : config.title,
text : config.msg, text : config.msg,
buttons: [ buttons : config.buttons
{
text: 'OK',
onClick: config.callback
}
]
}); });
Common.component.Analytics.trackEvent('Internal Error', id.toString()); Common.component.Analytics.trackEvent('Internal Error', id.toString());
@ -1783,7 +1781,8 @@ define([
errorFrmlMaxReference: 'You cannot enter this formula because it has too many values,<br>cell references, and/or names.', errorFrmlMaxReference: 'You cannot enter this formula because it has too many values,<br>cell references, and/or names.',
warnLicenseLimitedRenewed: 'License needs to be renewed.<br>You have a limited access to document editing functionality.<br>Please contact your administrator to get full access', warnLicenseLimitedRenewed: 'License needs to be renewed.<br>You have a limited access to document editing functionality.<br>Please contact your administrator to get full access',
warnLicenseLimitedNoAccess: 'License expired.<br>You have no access to document editing functionality.<br>Please contact your administrator.', warnLicenseLimitedNoAccess: 'License expired.<br>You have no access to document editing functionality.<br>Please contact your administrator.',
textGuest: 'Guest' textGuest: 'Guest',
errorDataValidate: 'The value you entered is not valid.<br>A user has restricted values that can be entered into this cell.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });