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

Making some service references more consistent

Browse Source 
Several admin controllers referenced INotifier, IAuthorizer, and IContentManager as individual services
rather than as the general IOrchardServices carrier. Some extra namespaces also removed.

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-02-25 21:59:17 -08:00
parent 1cea5ad9d2
commit 691908fb48
6 changed files with 79 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,23 +6,19 @@ using Orchard.Localization;
using Orchard.Media.Models;
using Orchard.Media.Services;
using Orchard.Media.ViewModels;
using Orchard.Security;
using Orchard.UI.Notify;
namespace Orchard.Media.Controllers {
[ValidateInput(false)]
public class AdminController : Controller {
private readonly IMediaService _mediaService;
private readonly IAuthorizer _authorizer;
private readonly INotifier _notifier;
public AdminController(IMediaService mediaService, IAuthorizer authorizer, INotifier notifier) {
public AdminController(IOrchardServices services, IMediaService mediaService) {
Services = services;
_mediaService = mediaService;
_authorizer = authorizer;
_notifier = notifier;
}
public IOrchardServices Services { get; set;}
public Localizer T { get; set; }
public ActionResult Index() {
@@ -44,7 +40,7 @@ namespace Orchard.Media.Controllers {
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Deleting Folder failed: " + exception.Message);
Services.Notifier.Error("Deleting Folder failed: " + exception.Message);
return View();
}
}
@@ -58,13 +54,13 @@ namespace Orchard.Media.Controllers {
var viewModel = new MediaFolderCreateViewModel();
try {
UpdateModel(viewModel);
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't create media folder")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't create media folder")))
return new HttpUnauthorizedResult();
_mediaService.CreateFolder(viewModel.MediaPath, viewModel.Name);
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Creating Folder failed: " + exception.Message);
Services.Notifier.Error("Creating Folder failed: " + exception.Message);
return View(viewModel);
}
}
@@ -83,14 +79,14 @@ namespace Orchard.Media.Controllers {
if (key.StartsWith("Checkbox.File.") && input[key] == "true") {
string fileName = key.Substring("Checkbox.File.".Length);
string folderName = input[fileName];
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media file")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media file")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFile(fileName, folderName);
}
else if (key.StartsWith("Checkbox.Folder.") && input[key] == "true") {
string folderName = key.Substring("Checkbox.Folder.".Length);
string folderPath = input[folderName];
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFolder(folderPath);
}
@@ -98,7 +94,7 @@ namespace Orchard.Media.Controllers {
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Deleting failed: " + exception.Message);
Services.Notifier.Error("Deleting failed: " + exception.Message);
return View();
}
}
@@ -116,13 +112,13 @@ namespace Orchard.Media.Controllers {
//TODO: There may be better ways to do this.
// Delete
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFolder(viewModel.MediaPath);
}
// Save
else {
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't rename media folder")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't rename media folder")))
return new HttpUnauthorizedResult();
_mediaService.RenameFolder(viewModel.MediaPath, viewModel.Name);
}
@@ -130,7 +126,7 @@ namespace Orchard.Media.Controllers {
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Modifying Folder Properties failed: " + exception.Message);
Services.Notifier.Error("Modifying Folder Properties failed: " + exception.Message);
return View(viewModel);
}
}
@@ -145,7 +141,7 @@ namespace Orchard.Media.Controllers {
var viewModel = new MediaItemAddViewModel();
try {
UpdateModel(viewModel);
if (!_authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file")))
if (!Services.Authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file")))
return new HttpUnauthorizedResult();
foreach (string fileName in Request.Files) {
@@ -156,7 +152,7 @@ namespace Orchard.Media.Controllers {
return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath });
}
catch (Exception exception) {
_notifier.Error("Uploading media file failed: " + exception.Message);
Services.Notifier.Error("Uploading media file failed: " + exception.Message);
return View(viewModel);
}
}
@@ -177,11 +173,11 @@ namespace Orchard.Media.Controllers {
var viewModel = new MediaItemEditViewModel();
try {
UpdateModel(viewModel);
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't modify media file")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't modify media file")))
return new HttpUnauthorizedResult();
// Delete
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media file")))
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media file")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFile(viewModel.Name, viewModel.MediaPath);
return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath });
@@ -205,7 +201,7 @@ namespace Orchard.Media.Controllers {
mediaPath = viewModel.MediaPath });
}
catch (Exception exception) {
_notifier.Error("Editing media file failed: " + exception.Message);
Services.Notifier.Error("Editing media file failed: " + exception.Message);
return View(viewModel);
}
}