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

[SSE] Add Asc.c_oAscError.ID.CannotUngroupError error

Browse source
This commit is contained in:
Julia Radzhabova 2019-06-05 15:26:29 +03:00
parent 4ee9361165
commit 600fec9163
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,15 +113,15 @@ define([
}, },
onUngroup: function(type) { onUngroup: function(type) {
var me = this, var me = this;
val = me.api.asc_checkAddGroup(true); // check ungroup
if (type=='rows') { if (type=='rows') {
(val!==undefined) && me.api.asc_ungroup(true) (me.api.asc_checkAddGroup(true)!==undefined) && me.api.asc_ungroup(true)
} else if (type=='columns') { } else if (type=='columns') {
(val!==undefined) && me.api.asc_ungroup(false) (me.api.asc_checkAddGroup(true)!==undefined) && me.api.asc_ungroup(false)
} else if (type=='clear') { } else if (type=='clear') {
me.api.asc_clearOutline(); me.api.asc_clearOutline();
} else { } else {
var val = me.api.asc_checkAddGroup(true);
if (val===null) { if (val===null) {
(new SSE.Views.GroupDialog({ (new SSE.Views.GroupDialog({
title: me.view.capBtnUngroup, title: me.view.capBtnUngroup,

5
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1358,6 +1358,10 @@ define([
config.msg = this.errorNoDataToParse; config.msg = this.errorNoDataToParse;
break; break;
case Asc.c_oAscError.ID.CannotUngroupError:
config.msg = this.errorCannotUngroup;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -2356,6 +2360,7 @@ define([
txtTable: 'Table', txtTable: 'Table',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
errorNoDataToParse: 'No data was selected to parse.', errorNoDataToParse: 'No data was selected to parse.',
errorCannotUngroup: 'Cannot ungroup. To start an outline, select the detail rows or columns and group them.',
waitText: 'Please, wait...' waitText: 'Please, wait...'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -404,6 +404,7 @@
"SSE.Controllers.Main.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.<br>Select a uniform data range different from the existing one and try again.", "SSE.Controllers.Main.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.<br>Select a uniform data range different from the existing one and try again.",
"SSE.Controllers.Main.errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.<br>Please unhide the filtered elements and try again.", "SSE.Controllers.Main.errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.<br>Please unhide the filtered elements and try again.",
"SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"SSE.Controllers.Main.errorCannotUngroup": "Cannot ungroup. To start an outline, select the detail rows or columns and group them.",
"SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.", "SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.",
"SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>", "SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",