From 1c21971194735cc84ee5646a01b5de1b02889a14 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 28 Nov 2019 14:47:10 +0300
Subject: [PATCH] [SSE] Refactoring sort settings

---
 .../main/app/view/SortDialog.js                  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js
index 60ee94a1a..8f4e3a52d 100644
--- a/apps/spreadsheeteditor/main/app/view/SortDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js
@@ -348,12 +348,12 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                 props: me.sortOptions,
                 handler : function(result, settings) {
                     if (result == 'ok' && settings) {
-                        me.sortOptions = settings;
                         me.lblColumn.text(settings.sortcol ? me.textColumn : me.textRow);
                         me.props.asc_setHasHeaders(settings.headers);
                         // me.props.asc_setCaseSensitive(settings.sensitive);
                         me.props.asc_setColumnSort(settings.sortcol);
-                        me.props.asc_updateSortList();
+                        me.props.asc_updateSortList(me.sortOptions.sortcol == settings.sortcol);
+                        me.sortOptions = settings;
                         me.updateSortValues();
                     }
                 }
@@ -554,24 +554,24 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                         var range = dlg.getSettings();
                         var isvalid;
                         if (!_.isEmpty(range)) {
-                            isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.CustomSort, range, true, !this.sortOptions.sortcol);
+                            isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.CustomSort, range, true, !me.sortOptions.sortcol);
                         }
 
                         if (isvalid == Asc.c_oAscError.ID.No) {
                             var index = me.props.asc_addBySortList(range);
                             me.fillSortValues();
-                            combo.setData(this.column_data);
+                            combo.setData(me.column_data);
                             combo.setValue(index);
                             item.set('columnIndex', index);
-                            this.levels[item.get('levelIndex')].levelProps = me.props.asc_getLevelProps(index);
+                            me.levels[item.get('levelIndex')].levelProps = me.props.asc_getLevelProps(index);
                             me.updateOrderList(item.get('levelIndex'));
                             return false;
                         } else if (isvalid == Asc.c_oAscError.ID.CustomSortMoreOneSelectedError)
-                            Common.UI.warning({msg: this.sortOptions.sortcol ? this.errorMoreOneCol: this.errorMoreOneRow});
+                            Common.UI.warning({msg: me.sortOptions.sortcol ? me.errorMoreOneCol: me.errorMoreOneRow});
                         else if (isvalid == Asc.c_oAscError.ID.CustomSortNotOriginalSelectError)
-                            Common.UI.warning({msg: this.sortOptions.sortcol ? this.errorNotOriginalCol : this.errorNotOriginalRow});
+                            Common.UI.warning({msg: me.sortOptions.sortcol ? me.errorNotOriginalCol : me.errorNotOriginalRow});
                         else
-                            Common.UI.warning({msg: this.txtInvalidRange});
+                            Common.UI.warning({msg: me.txtInvalidRange});
                         return true;
                     }
                 };