IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Web.Api: SettingsController: added new model for timezones"

Browse Source 
This reverts commit 43c445d31b.
This commit is contained in:
Daniil Senkiv 2019-10-30 11:00:38 +03:00
parent 43c445d31b
commit fafa3f5ec0
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -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")]

8
web/ASC.Web.Api/Models/TimezonesModel.cs
View File

@ -1,8 +0,0 @@
namespace ASC.Web.Api.Models
{
public class TimezonesModel
{
public string Id { get; set; }
public string DisplayName { get; set; }
}
}

2
web/ASC.Web.Client/src/components/pages/Settings/sub-components/common/customization.js
View File

@ -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 };
});
};