diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js
index bff7bcd91..cf8a5635c 100644
--- a/apps/spreadsheeteditor/main/app/controller/DataTab.js
+++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js
@@ -113,15 +113,15 @@ define([
},
onUngroup: function(type) {
- var me = this,
- val = me.api.asc_checkAddGroup(true); // check ungroup
+ var me = this;
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') {
- (val!==undefined) && me.api.asc_ungroup(false)
+ (me.api.asc_checkAddGroup(true)!==undefined) && me.api.asc_ungroup(false)
} else if (type=='clear') {
me.api.asc_clearOutline();
} else {
+ var val = me.api.asc_checkAddGroup(true);
if (val===null) {
(new SSE.Views.GroupDialog({
title: me.view.capBtnUngroup,
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 6b978e8d7..572c82a64 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1358,6 +1358,10 @@ define([
config.msg = this.errorNoDataToParse;
break;
+ case Asc.c_oAscError.ID.CannotUngroupError:
+ config.msg = this.errorCannotUngroup;
+ break;
+
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@@ -2356,6 +2360,7 @@ define([
txtTable: 'Table',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.',
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...'
}
})(), SSE.Controllers.Main || {}))
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index da47e4477..f76a73c32 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -404,6 +404,7 @@
"SSE.Controllers.Main.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
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.
Please unhide the filtered elements and try again.",
"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.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.
When you click the 'OK' button, you will be prompted to download the document.
Find more information about connecting Document Server here",