Browse Source

Code unified.

pull/241/head
Sebastian Stehle 8 years ago
parent
commit
d71283eb1a
  1. 18
      src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs
  2. 2
      src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs

18
src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs

@ -73,10 +73,12 @@ namespace Squidex.Areas.Api.Controllers.Assets
[ApiCosts(1)] [ApiCosts(1)]
public async Task<IActionResult> GetAssets(string app, [FromQuery] string ids = null) public async Task<IActionResult> GetAssets(string app, [FromQuery] string ids = null)
{ {
var idsList = new HashSet<Guid>(); HashSet<Guid> idsList = null;
if (!string.IsNullOrWhiteSpace(ids)) if (!string.IsNullOrWhiteSpace(ids))
{ {
idsList = new HashSet<Guid>();
foreach (var id in ids.Split(',')) foreach (var id in ids.Split(','))
{ {
if (Guid.TryParse(id, out var guid)) if (Guid.TryParse(id, out var guid))
@ -86,16 +88,10 @@ namespace Squidex.Areas.Api.Controllers.Assets
} }
} }
IResultList<IAssetEntity> assets; var assets =
idsList?.Count > 0 ?
if (idsList.Count > 0) await assetRepository.QueryAsync(App.Id, idsList) :
{ await assetRepository.QueryAsync(App.Id, Request.QueryString.ToString());
assets = await assetRepository.QueryAsync(App.Id, idsList);
}
else
{
assets = await assetRepository.QueryAsync(App.Id, Request.QueryString.ToString());
}
var response = new AssetsDto var response = new AssetsDto
{ {

2
src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs

@ -85,7 +85,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
var isFrontendClient = User.IsFrontendClient(); var isFrontendClient = User.IsFrontendClient();
var result = var result =
idsList != null ? idsList?.Count > 0 ?
await contentQuery.QueryAsync(App, name, User, archived, idsList) : await contentQuery.QueryAsync(App, name, User, archived, idsList) :
await contentQuery.QueryAsync(App, name, User, archived, Request.QueryString.ToString()); await contentQuery.QueryAsync(App, name, User, archived, Request.QueryString.ToString());

Loading…
Cancel
Save