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

Merge pull request #6677 from Skrypt/issue/#6512

Browse Source 
Fixing multiple Media Library:clone

Fixes #6512
This commit is contained in:
Sébastien Ros
2016-03-31 12:45:57 -07:00
parent b36c34bbf4 3694444ff3
commit a624080fb2
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,8 +213,7 @@ namespace Orchard.MediaLibrary.Controllers {
}
return Json(true);
}
catch(Exception e) {
} catch (Exception e) {
Logger.Error(e, "Could not delete media items.");
return Json(false);
}
@@ -232,7 +231,7 @@ namespace Orchard.MediaLibrary.Controllers {
return new HttpUnauthorizedResult();
}
var newFileName = Path.GetFileNameWithoutExtension(media.FileName) + " Copy" + Path.GetExtension(media.FileName);
var newFileName = _mediaLibraryService.GetUniqueFilename(media.FolderPath, media.FileName);
_mediaLibraryService.CopyFile(media.FolderPath, media.FileName, media.FolderPath, newFileName);
@@ -241,13 +240,14 @@ namespace Orchard.MediaLibrary.Controllers {
var clonedTitlePart = clonedContentItem.As<TitlePart>();
clonedMediaPart.FileName = newFileName;
clonedMediaPart.FolderPath = media.FolderPath;
clonedMediaPart.MimeType = media.MimeType;
clonedTitlePart.Title = clonedTitlePart.Title + " Copy";
Services.ContentManager.Create(clonedContentItem);
Services.ContentManager.Publish(clonedContentItem);
return Json(true);
}
catch (Exception e) {
} catch (Exception e) {
Logger.Error(e, "Could not clone media item.");
return Json(false);
}