lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 21:13:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adjusting Orchard.Media module for storage path conventions

Browse Source 
IMediaService no longer calculates root path as physical folder
Public urls are provided by IStorageProvider

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-05-03 11:18:10 -07:00
parent f60608368c
commit ae2c225070
11 changed files with 230 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
View File

@@ -186,9 +186,9 @@ namespace Orchard.Media.Controllers {
}
var file = Request.Files[0];
_mediaService.UploadMediaFile(viewModel.MediaPath, file);
var publicUrl = _mediaService.UploadMediaFile(viewModel.MediaPath, file);
return Content(string.Format("<script type=\"text/javascript\">var result = {{ url: \"{0}\" }};</script>", Path.Combine(_mediaService.GetRootUrl(), string.Format("{0}/{1}", viewModel.MediaPath, Path.GetFileName(file.FileName)).Replace("//", "/")).Replace("\\", "/")));
return Content(string.Format("<script type=\"text/javascript\">var result = {{ url: \"{0}\" }};</script>", publicUrl));
}
catch (Exception exception) {
return Content(string.Format("<script type=\"text/javascript\">var result = {{ error: \"{0}\" }};</script>", T("ERROR: Uploading media file failed: {0}", exception.Message)));
@@ -203,6 +203,7 @@ namespace Orchard.Media.Controllers {
model.Size = size;
model.FolderName = folderName;
model.MediaPath = mediaPath;
model.PublicUrl = _mediaService.GetPublicUrl(Path.Combine(mediaPath, name));
return View(model);
}