From f5862bd62885f154c2b9c0d06379a0cf25071b86 Mon Sep 17 00:00:00 2001 From: mvarblow Date: Wed, 13 May 2015 16:54:23 -0400 Subject: [PATCH 1/2] Update MediaController.cs Fix for issue https://github.com/OrchardCMS/Orchard/issues/5275. The fix is to return the FolderPath element in the response to the media search request so that the folderPath check in the javascript code succeeds. --- .../Modules/Orchard.Search/Controllers/MediaController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/MediaController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/MediaController.cs index e7e029c19..0acb1c2ed 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/MediaController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/MediaController.cs @@ -59,10 +59,11 @@ namespace Orchard.Search.Controllers { var viewModel = new MediaManagerMediaItemsViewModel { MediaItems = mediaItems, - MediaItemsCount = mediaPartsCount + MediaItemsCount = mediaPartsCount, + FolderPath = folderPath }; return View(viewModel); } } -} \ No newline at end of file +} From fa7bf025b973b1296f7806494caefa97ee8fd18d Mon Sep 17 00:00:00 2001 From: mvarblow Date: Wed, 13 May 2015 16:57:10 -0400 Subject: [PATCH 2/2] Update MediaItems.cshtml --- .../Modules/Orchard.Search/Views/Media/MediaItems.cshtml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Media/MediaItems.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/Media/MediaItems.cshtml index 5263d9707..3dad0b9ef 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Media/MediaItems.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Media/MediaItems.cshtml @@ -17,8 +17,9 @@ mimeTypeClass = x.MediaPart.MimeType.HtmlClassify(), thumbnail = Display(x.Shape).ToString(), editLink = Url.ItemEditUrl(x.MediaPart) - }).ToArray() + }).ToArray(), + folderPath = Model.FolderPath })) } - \ No newline at end of file +