Browse Source
Merge pull request #17159 from abpframework/TimeZoneSettingsAppService
pull/17163/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
2 deletions
-
modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs
|
|
|
@ -20,8 +20,12 @@ public class TimeZoneSettingsAppService : SettingManagementAppServiceBase, ITime |
|
|
|
|
|
|
|
public virtual async Task<string> GetAsync() |
|
|
|
{ |
|
|
|
var timezone = await SettingProvider.GetOrNullAsync(TimingSettingNames.TimeZone); |
|
|
|
return timezone ?? "UTC"; |
|
|
|
if (CurrentTenant.GetMultiTenancySide() == MultiTenancySides.Host) |
|
|
|
{ |
|
|
|
return await SettingManager.GetOrNullGlobalAsync(TimingSettingNames.TimeZone); |
|
|
|
} |
|
|
|
|
|
|
|
return await SettingManager.GetOrNullForCurrentTenantAsync(TimingSettingNames.TimeZone); |
|
|
|
} |
|
|
|
|
|
|
|
public virtual Task<List<NameValue>> GetTimezonesAsync() |
|
|
|
|
