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

[Fixes #7452] Media Library: Replacing a media item in recent section (#7484)

Browse Source 
Fixes #7452
This commit is contained in:
Hannan Azam Khan
2016-12-23 01:15:00 +05:00
committed by Sébastien Ros
parent 923646c27f
commit 8425fb4829
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,11 +83,6 @@ namespace Orchard.MediaLibrary.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageOwnMedia, T("Cannot import media"))) if (!Services.Authorizer.Authorize(Permissions.ManageOwnMedia, T("Cannot import media")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
// Check permission
if (!Services.Authorizer.Authorize(Permissions.ManageMediaContent) && !_mediaLibraryService.CanManageMediaFolder(folderPath)) {
return new HttpUnauthorizedResult();
}
var mediaProviderMenu = _navigationManager.BuildMenu("mediaproviders"); var mediaProviderMenu = _navigationManager.BuildMenu("mediaproviders");
var imageSets = _navigationManager.BuildImageSets("mediaproviders"); var imageSets = _navigationManager.BuildImageSets("mediaproviders");
@@ -98,12 +93,23 @@ namespace Orchard.MediaLibrary.Controllers {
MediaTypes = _mediaLibraryService.GetMediaTypes(), MediaTypes = _mediaLibraryService.GetMediaTypes(),
}; };
if (replaceId != null) { if (replaceId.HasValue) {
var replaceMedia = Services.ContentManager.Get(replaceId.Value).As<MediaPart>(); var replaceMedia = Services.ContentManager.Get(replaceId.Value).As<MediaPart>();
if (replaceMedia == null) if (replaceMedia == null)
return HttpNotFound(); return HttpNotFound();
// Check permission
if (!Services.Authorizer.Authorize(Permissions.ManageMediaContent) && !_mediaLibraryService.CanManageMediaFolder(replaceMedia.FolderPath)) {
return new HttpUnauthorizedResult();
}
viewModel.Replace = replaceMedia; viewModel.Replace = replaceMedia;
viewModel.FolderPath = replaceMedia.FolderPath;
} else {
// Check permission
if (!Services.Authorizer.Authorize(Permissions.ManageMediaContent) && !_mediaLibraryService.CanManageMediaFolder(folderPath)) {
return new HttpUnauthorizedResult();
}
} }
return View(viewModel); return View(viewModel);