Browse Source

Fix asset context issue.

pull/596/head
Sebastian 6 years ago
parent
commit
7105aa4b64
  1. 16
      backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs

16
backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs

@ -80,7 +80,12 @@ namespace Squidex.Areas.Api.Controllers.Assets
asset = await assetRepository.FindAssetBySlugAsync(AppId, idOrSlug); asset = await assetRepository.FindAssetBySlugAsync(AppId, idOrSlug);
} }
return await DeliverAssetAsync(asset, queries); if (asset != null && queries.Version > EtagVersion.Any && asset.Version != queries.Version)
{
asset = await assetLoader.GetAsync(App.Id, asset.Id, queries.Version);
}
return DeliverAsset(asset, queries);
} }
/// <summary> /// <summary>
@ -103,10 +108,10 @@ namespace Squidex.Areas.Api.Controllers.Assets
{ {
var asset = await assetRepository.FindAssetAsync(id); var asset = await assetRepository.FindAssetAsync(id);
return await DeliverAssetAsync(asset, queries); return DeliverAsset(asset, queries);
} }
private async Task<IActionResult> DeliverAssetAsync(IAssetEntity? asset, AssetContentQueryDto queries) private IActionResult DeliverAsset(IAssetEntity? asset, AssetContentQueryDto queries)
{ {
queries ??= new AssetContentQueryDto(); queries ??= new AssetContentQueryDto();
@ -122,11 +127,6 @@ namespace Squidex.Areas.Api.Controllers.Assets
return StatusCode(403); return StatusCode(403);
} }
if (queries.Version > EtagVersion.Any && asset.Version != queries.Version)
{
asset = await assetLoader.GetAsync(App.Id, asset.Id, queries.Version);
}
var resizeOptions = queries.ToResizeOptions(asset); var resizeOptions = queries.ToResizeOptions(asset);
FileCallback callback; FileCallback callback;

Loading…
Cancel
Save