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

Some more work on being able to add media from the (TinyMCE) editor

Browse Source 
- TinyMCE module takes a dependency on the current media module api with the addmedia plugin which is functional to the point of being able to add media*

* it still needs a setting of where the media should go (current spec and xmlrpc api say <blog slug>/<post slug> for a blog post but (1) I don't even have that context from the editor and (2) what about other content types)
* it (the plugin) still needs to do an async post and handle the returned JSON appropriatly (insert image tag into the editor using returned url and close the dialog otherwise present any given error)

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-03-04 02:58:49 -08:00
parent d1f9fad499
commit f2df4df51c
10 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Web;
using System.Web.Mvc;
using Orchard.Localization;
@@ -162,18 +163,27 @@ namespace Orchard.Media.Controllers {
var viewModel = new MediaItemAddViewModel();
try {
UpdateModel(viewModel);
if (!Services.Authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file")))
return Json(T("ERROR: You don't have permission to upload media files"));
if (!Services.Authorizer.Authorize(Permissions.UploadMediaFiles))
return Json(new { error = T("ERROR: You don't have permission to upload media files").ToString() });
foreach (string fileName in Request.Files) {
HttpPostedFileBase file = Request.Files[fileName];
_mediaService.UploadMediaFile(viewModel.MediaPath, file);
if (Request.Files.Count < 1 || Request.Files[0].ContentLength == 0)
return Json(new { error = T("HEY: You didn't give me a file to upload").ToString() });
try {
_mediaService.GetMediaFiles(viewModel.MediaPath);
}
catch //media api needs a little work, like everything else of course ;)
{
_mediaService.CreateFolder(viewModel.MediaPath, "");
}
return Json(viewModel.MediaPath);
var file = Request.Files[0];
_mediaService.UploadMediaFile(viewModel.MediaPath, file);
return Json(new { url = Path.Combine(_mediaService.GetRootUrl(), string.Format("{0}/{1}", viewModel.MediaPath, file.FileName)).Replace("\\", "/") });
}
catch (Exception exception) {
return Json("ERROR: Uploading media file failed: " + exception.Message);
return Json(new { error = T("ERROR: Uploading media file failed: {0}", exception.Message).ToString() });
}
}