lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#20546 : fixing issue where multiple media item requests can appear in one window.

Browse Source 
Work Item: 20546
This commit is contained in:
Benjamin Grabkowitz
2014-03-12 13:17:25 -04:00
committed by Nicholas Mayne
parent 4761ec4313
commit 1e9d14ac2c
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
View File

@@ -100,7 +100,8 @@ namespace Orchard.MediaLibrary.Controllers {
var viewModel = new MediaManagerMediaItemsViewModel {
MediaItems = mediaItems,
MediaItemsCount = mediaPartsCount
MediaItemsCount = mediaPartsCount,
FolderPath = folderPath
};
return View(viewModel);

8
src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js
View File

@@ -130,7 +130,13 @@ $(function () {
url: url,
cache: false
}).done(function(data) {
var mediaItems = data.mediaItems;
var mediaItems = data.mediaItems;
var mediaItemsFolderPath = data.folderPath;
if (mediaItemsFolderPath !== self.displayed()) {
return;
}
self.mediaItemsCount = data.mediaItemsCount;
for (var i = 0; i < mediaItems.length; i++) {
var item = new mediaPartViewModel(mediaItems[i]);

1
src/Orchard.Web/Modules/Orchard.MediaLibrary/ViewModels/MediaManagerMediaItemsViewModel.cs
View File

@@ -5,6 +5,7 @@ namespace Orchard.MediaLibrary.ViewModels {
public class MediaManagerMediaItemsViewModel {
public IList<MediaManagerMediaItemViewModel> MediaItems { get; set; }
public int MediaItemsCount { get; set; }
public string FolderPath { get; set; }
}
public class MediaManagerMediaItemViewModel {

3
src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/MediaItems.cshtml
View File

@@ -18,7 +18,8 @@
mimeTypeClass = x.MediaPart.MimeType.HtmlClassify(),
thumbnail = Display(x.Shape).ToString(),
editLink = Url.ItemEditUrl(x.MediaPart)
}).ToArray()
}).ToArray(),
folderPath = Model.FolderPath
}))
}