lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolving merge conflict in MediaLibraryPickerFieldHandler between fd3ad79dca and 03884cbd64

Browse Source
This commit is contained in:
Benedek Farkas
2024-03-08 18:21:06 +01:00
parent ccdeeab4d6
commit 52b40538ce
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.MediaLibrary/Handlers/MediaLibraryPickerFieldHandler.cs
View File

@@ -1,6 +1,4 @@
using System; using System.Linq;
using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
using Orchard.ContentManagement.MetaData; using Orchard.ContentManagement.MetaData;
@@ -11,9 +9,7 @@ namespace Orchard.MediaLibrary.Handlers {
public class MediaLibraryPickerFieldHandler : ContentHandler { public class MediaLibraryPickerFieldHandler : ContentHandler {
private readonly IContentDefinitionManager _contentDefinitionManager; private readonly IContentDefinitionManager _contentDefinitionManager;
public MediaLibraryPickerFieldHandler( public MediaLibraryPickerFieldHandler(IContentDefinitionManager contentDefinitionManager) {
IContentDefinitionManager contentDefinitionManager) {
_contentDefinitionManager = contentDefinitionManager; _contentDefinitionManager = contentDefinitionManager;
} }
@@ -34,7 +30,8 @@ namespace Orchard.MediaLibrary.Handlers {
foreach (var field in fields) { foreach (var field in fields) {
var localField = field; var localField = field;
// Using context content item's ContentManager instead of injected one to avoid lifetime scope exceptions in case of LazyFields. // Using context content item's ContentManager instead of injected one to avoid lifetime scope exceptions in case of LazyFields.
localField._contentItems = new Lazy<IEnumerable<MediaPart>>(() => contentItem.ContentManager.GetMany<MediaPart>(localField.Ids, VersionOptions.Published, QueryHints.Empty).ToList()); localField._contentItems.Loader(() =>
contentItem.ContentManager.GetMany<MediaPart>(localField.Ids, VersionOptions.Published, QueryHints.Empty).ToList());
} }
} }
} }