Add support for all versions

Fix #16027
OrchardCMS · May 17, 2024 · b419d64 · b419d64
1 parent 07592c1
commit b419d64
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
@@ -95,8 +95,14 @@ public async Task<ContentItem> GetAsync(string contentItemId, VersionOptions opt
             {
                 return null;
             }
+
             options ??= VersionOptions.Published;
 
+            if (options.IsAllVersions)
+            {
+                throw new ArgumentException($"This method does not support {nameof(options.IsAllVersions)} option.");
+            }
+
             ContentItem contentItem = null;
 
             if (options.IsLatest)
@@ -236,6 +242,14 @@ public async Task<IEnumerable<ContentItem>> GetAsync(IEnumerable<string> content
                     contentItems.AddRange(missingItems);
                 }
             }
+            else if (options.IsAllVersions)
+            {
+                contentItems = (await _session
+                    .Query<ContentItem, ContentItemIndex>()
+                    .Where(x => x.ContentItemId.IsIn(ids))
+                    .ListAsync()
+                    ).ToList();
+            }
 
             var needVersions = new List<ContentItem>();
             var finalItems = new List<ContentItem>();
@@ -550,6 +564,11 @@ public async Task CreateAsync(ContentItem contentItem, VersionOptions options =
 
             options ??= VersionOptions.Published;
 
+            if (options.IsAllVersions)
+            {
+                throw new ArgumentException($"This method does not support {nameof(options.IsAllVersions)} option.");
+            }
+
             // Draft flag on create is required for explicitly-published content items
             if (options.IsDraft)
             {