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

Merge branch 'master' into feature/feed

Browse Source
This commit is contained in:
pavelbannov 2020-06-04 11:53:00 +03:00
commit 84a3c67e1e
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Data.Reassigns/QueueWorker.cs
View File

@ -26,7 +26,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using ASC.Common;
using ASC.Common.Threading.Progress;
@ -34,14 +33,15 @@ using ASC.Core.Users;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives;
namespace ASC.Data.Reassigns
{
public class QueueWorker
{
public static Dictionary<string, string> GetHttpHeaders(HttpRequest httpRequest)
public static IDictionary<string, StringValues> GetHttpHeaders(HttpRequest httpRequest)
{
return httpRequest?.Headers.Keys.ToDictionary(key => key, key => httpRequest.Headers[key].ToString());
return httpRequest?.Headers;
}
}
public class QueueWorker<T> where T : class, IProgressItem

5
common/ASC.Data.Reassigns/ReassignProgressItem.cs
View File

@ -44,13 +44,14 @@ using ASC.Web.Studio.Core.Notify;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives;
namespace ASC.Data.Reassigns
{
public class ReassignProgressItem : IProgressItem
{
private readonly HttpContext _context;
private readonly Dictionary<string, string> _httpHeaders;
private readonly IDictionary<string, StringValues> _httpHeaders;
private readonly int _tenantId;
private readonly Guid _currentUserId;

5
common/ASC.Data.Reassigns/RemoveProgressItem.cs
View File

@ -46,12 +46,13 @@ using ASC.Web.Studio.Core.Notify;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives;
namespace ASC.Data.Reassigns
{
public class RemoveProgressItem : IProgressItem
{
private readonly Dictionary<string, string> _httpHeaders;
private readonly IDictionary<string, StringValues> _httpHeaders;
private readonly int _tenantId;
private readonly Guid _currentUserId;

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

@ -313,7 +313,7 @@ namespace ASC.Api.Settings
[Read("cultures")]
public IEnumerable<object> GetSupportedCultures()
{
return SetupInfo.EnabledCultures.Select(r => new { r.Name });
return SetupInfo.EnabledCultures.Select(r => r.Name).ToArray();
}
[Read("timezones")]