From d71283eb1a3e61598ce4f371e2732e374fc21e3f Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Fri, 2 Feb 2018 16:26:52 +0100
Subject: [PATCH] Code unified.

---
 .../Api/Controllers/Assets/AssetsController.cs | 18 +++++++-----------
 .../Controllers/Content/ContentsController.cs  |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs
index 1fb894850..386e84edc 100644
--- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs
@@ -73,10 +73,12 @@ namespace Squidex.Areas.Api.Controllers.Assets
         [ApiCosts(1)]
         public async Task<IActionResult> GetAssets(string app, [FromQuery] string ids = null)
         {
-            var idsList = new HashSet<Guid>();
+            HashSet<Guid> idsList = null;
 
             if (!string.IsNullOrWhiteSpace(ids))
             {
+                idsList = new HashSet<Guid>();
+
                 foreach (var id in ids.Split(','))
                 {
                     if (Guid.TryParse(id, out var guid))
@@ -86,16 +88,10 @@ namespace Squidex.Areas.Api.Controllers.Assets
                 }
             }
 
-            IResultList<IAssetEntity> assets;
-
-            if (idsList.Count > 0)
-            {
-                assets = await assetRepository.QueryAsync(App.Id, idsList);
-            }
-            else
-            {
-                assets = await assetRepository.QueryAsync(App.Id, Request.QueryString.ToString());
-            }
+            var assets =
+                idsList?.Count > 0 ?
+                    await assetRepository.QueryAsync(App.Id, idsList) :
+                    await assetRepository.QueryAsync(App.Id, Request.QueryString.ToString());
 
             var response = new AssetsDto
             {
diff --git a/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
index b334abd7c..9fb56d378 100644
--- a/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
@@ -85,7 +85,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
             var isFrontendClient = User.IsFrontendClient();
 
             var result =
-                idsList != null ?
+                idsList?.Count > 0 ?
                     await contentQuery.QueryAsync(App, name, User, archived, idsList) :
                     await contentQuery.QueryAsync(App, name, User, archived, Request.QueryString.ToString());