From 282cf2099736ee1b92bab4a08dbf67ada3b624ee Mon Sep 17 00:00:00 2001 From: Daniil Senkiv Date: Fri, 8 Nov 2019 10:55:35 +0300 Subject: [PATCH] Web.Client: Settings: Customization: fixed in constructor: select first item in timezone and language comboboxes, if not found current value from redux --- .../pages/Settings/categories/common/customization.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js index 814a1b8b40..960e062462 100644 --- a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js +++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js @@ -60,9 +60,9 @@ class Customization extends React.Component { isLoadedData: false, isLoading: false, timezones, - timezone: findSelectedItemByKey(timezones, portalTimeZoneId), + timezone: findSelectedItemByKey(timezones, portalTimeZoneId || timezones[0]), languages, - language: findSelectedItemByKey(languages, portalLanguage), + language: findSelectedItemByKey(languages, portalLanguage || languages[0]), greetingTitle: greetingSettings, isLoadingGreetingSave: false, isLoadingGreetingRestore: false,