diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index f985c7c00..1bd4db483 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -529,6 +529,37 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', var rec = this.sortList.store.findWhere({columnIndex: null}); if (rec) Common.UI.warning({msg: this.errorEmpty}); + else { + var store = this.sortList.store, + len = store.length; + for (var index=0; index=0; i--) { + var itemcheck = store.at(i), + levelcheck = this.levels[itemcheck.get('levelIndex')]; + if (item.get('columnIndex') == itemcheck.get('columnIndex') && sort == levelcheck.cmbSort.getValue()) { + if (sort == Asc.c_oAscSortOptions.ByColorFill || sort==Asc.c_oAscSortOptions.ByColorFont) { + var colorcheck = levelcheck.cmbColor.getSelectedRecord(); + if (color && colorcheck && color.value == colorcheck.value) { + rec = levelProp.cmbColumn.getSelectedRecord().displayValue; + rec = this.errorSameColumnColor.replace('%1', rec); + break; + } + } else { + rec = levelProp.cmbColumn.getSelectedRecord().displayValue; + rec = this.errorSameColumnValue.replace('%1', rec); + break; + } + } + } + if (rec) + break; + } + rec && Common.UI.warning({msg: rec}); + } return !rec; }, @@ -634,7 +665,9 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', errorMoreOneCol: 'More than one column is selected.', txtInvalidRange: 'Invalid cells range.', textMoreRows: '(More rows...)', - textMoreCols: '(More columns...)' + textMoreCols: '(More columns...)', + errorSameColumnValue: "%1 is being sorted by values more than once.
Delete the duplicate sort criteria and try again.", + errorSameColumnColor: "%1 is being sorted by the same color more than once.
Delete the duplicate sort criteria and try again." }, SSE.Views.SortDialog || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index f90572c3f..1a009da3f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2117,6 +2117,8 @@ "SSE.Views.SortDialog.txtInvalidRange": "Invalid cells range.", "SSE.Views.SortDialog.textMoreRows": "(More rows...)", "SSE.Views.SortDialog.textMoreCols": "(More columns...)", + "SSE.Views.SortDialog.errorSameColumnValue": "%1 is being sorted by values more than once.
Delete the duplicate sort criteria and try again.", + "SSE.Views.SortDialog.errorSameColumnColor": "%1 is being sorted by the same color more than once.
Delete the duplicate sort criteria and try again.", "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(Copy to end)", "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Move to end)", "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Copy before sheet",