From fafa3f5ec0835dc60d767644768edf0928a72d62 Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Wed, 30 Oct 2019 11:00:38 +0300
Subject: [PATCH] Revert "Web.Api: SettingsController: added new model for
 timezones"

This reverts commit 43c445d31b7a7df1a1e22c2b219d76dc97f872af.
---
 .../Controllers/SettingsController.cs         | 25 ++-----------------
 web/ASC.Web.Api/Models/TimezonesModel.cs      |  8 ------
 .../sub-components/common/customization.js    |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 web/ASC.Web.Api/Models/TimezonesModel.cs

diff --git a/web/ASC.Web.Api/Controllers/SettingsController.cs b/web/ASC.Web.Api/Controllers/SettingsController.cs
index 85492a6809..75a2e58ff8 100644
--- a/web/ASC.Web.Api/Controllers/SettingsController.cs
+++ b/web/ASC.Web.Api/Controllers/SettingsController.cs
@@ -146,8 +146,7 @@ namespace ASC.Api.Settings
         }
 
         [Read("timezones")]
-        
-        public List<object> GetTimeZones()
+        public IEnumerable<TimeZoneInfo> GetTimeZones()
         {
             var timeZones =  TimeZoneInfo.GetSystemTimeZones().ToList();
 
@@ -156,27 +155,7 @@ namespace ASC.Api.Settings
                 timeZones.Add(TimeZoneInfo.Utc);
             }
 
-            List<object> listOfTimezones = new List<object>();
-
-            foreach (var tz in timeZones.OrderBy(z => z.BaseUtcOffset))
-            {
-                var displayName = tz.DisplayName;
-                if (!displayName.StartsWith("(UTC") && !displayName.StartsWith("UTC"))
-                {
-                    if (tz.BaseUtcOffset != TimeSpan.Zero)
-                    {
-                        displayName = string.Format("(UTC{0}{1}) ", tz.BaseUtcOffset < TimeSpan.Zero ? "-" : "+", tz.BaseUtcOffset.ToString(@"hh\:mm")) + displayName;
-                    }
-                    else
-                    {
-                        displayName = "(UTC) " + displayName;
-                    }
-                }
-                listOfTimezones.Add(new TimezonesModel{ Id = tz.Id, DisplayName = displayName });
-
-            }
-
-            return listOfTimezones;
+            return timeZones;
         }
 
         [Read("recalculatequota")]
diff --git a/web/ASC.Web.Api/Models/TimezonesModel.cs b/web/ASC.Web.Api/Models/TimezonesModel.cs
deleted file mode 100644
index 3831dbedd1..0000000000
--- a/web/ASC.Web.Api/Models/TimezonesModel.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace ASC.Web.Api.Models
-{
-    public class TimezonesModel
-    {
-        public string Id { get; set; }
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/sub-components/common/customization.js b/web/ASC.Web.Client/src/components/pages/Settings/sub-components/common/customization.js
index bee352a385..92d9595193 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/sub-components/common/customization.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/sub-components/common/customization.js
@@ -14,7 +14,7 @@ const mapCulturesToArray = (cultures, t) => {
 
 const mapTimezonesToArray = (timezones) => {
    return timezones.map((timezone) => {
-      return { key: timezone.id, label: timezone.displayName };
+      return { key: timezone.Id, label: timezone.DisplayName };
    });
 };