From 477405bd3ce62b85bdb6429022310d21c296251a Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 14 Oct 2010 14:51:41 -0700 Subject: [PATCH] Refactored action results to use defaults --HG-- branch : dev --- .../Core/Contents/Controllers/AdminController.cs | 2 +- .../Core/Dashboard/Views/Admin/Index.cshtml | 2 +- .../Controllers/AdminController.cs | 2 +- .../Controllers/CommandsController.cs | 4 ++-- .../Orchard.Experimental/Controllers/HomeController.cs | 2 +- .../Controllers/ShapeTableController.cs | 2 +- .../Orchard.Packaging/Controllers/GalleryController.cs | 10 +++++----- .../Orchard.Users/Controllers/AccountController.cs | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index 0ea9a99ab..77e3b28b4 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -203,7 +203,7 @@ namespace Orchard.Core.Contents.Controllers { var viewModel = Shape.ViewModel() .ContentTypes(list); - return View("CreatableTypeList", viewModel); + return View(viewModel); } public ActionResult Create(string id) { diff --git a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml index bc5395e4b..270b70744 100644 --- a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml @@ -11,7 +11,7 @@ } - diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs index 0e8f9ab48..916f4160c 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs @@ -27,7 +27,7 @@ namespace Orchard.ContentTypes.Controllers { #region Types public ActionResult List() { - return View("List", new ListContentTypesViewModel { + return View(new ListContentTypesViewModel { Types = _contentDefinitionService.GetTypes() }); } diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs index 5bb02d8fd..720179bec 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs @@ -22,7 +22,7 @@ namespace Orchard.Experimental.Controllers { } public ActionResult Execute() { - return View("Execute", new CommandsExecuteViewModel()); + return View(new CommandsExecuteViewModel()); } [HttpPost] @@ -37,7 +37,7 @@ namespace Orchard.Experimental.Controllers { .Distinct() .ToArray(); model.Results = writer.ToString(); - return View("Execute", model); + return View(model); } private static CommandParameters GetCommandParameters(string commandLine, StringWriter writer) { diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs index 9c21e0e6d..8e6679047 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs @@ -101,7 +101,7 @@ namespace Orchard.Experimental.Controllers { ViewModel.Page.Messages.Add(new HtmlString("
abuse
")); ViewModel.Page.Messages.Add("
encoded
"); - return View("UsingShapes", model); + return View(model); } public static string Break(dynamic view) { diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs index 0a5391ed0..56f7dccda 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs @@ -13,7 +13,7 @@ namespace Orchard.Experimental.Controllers { } public ActionResult ShapeTable(string themeName) { - return View("ShapeTable", _shapeTableManager.GetShapeTable(themeName)); + return View(_shapeTableManager.GetShapeTable(themeName)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs index a2e2e3560..e94dd01aa 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs @@ -43,7 +43,7 @@ namespace Orchard.Packaging.Controllers { } public ActionResult Sources() { - return View("Sources", new PackagingSourcesViewModel { + return View(new PackagingSourcesViewModel { Sources = _packagingSourceManager.GetSources(), }); } @@ -107,7 +107,7 @@ namespace Orchard.Packaging.Controllers { public ActionResult Modules(Guid? sourceId) { var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault(); - return View("Modules", new PackagingModulesViewModel { + return View(new PackagingModulesViewModel { Modules = _packagingSourceManager.GetModuleList(selectedSource).Where(p => p.SyndicationItem.Categories.All(c => c.Name == "Orchard Module" || c.Name != "Orchard Theme")), Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle), SelectedSource = selectedSource @@ -117,7 +117,7 @@ namespace Orchard.Packaging.Controllers { public ActionResult Themes(Guid? sourceId) { var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault(); - return View("Themes", new PackagingModulesViewModel { + return View(new PackagingModulesViewModel { Modules = _packagingSourceManager.GetModuleList(selectedSource).Where(p => p.SyndicationItem.Categories.Any(c => c.Name == "Orchard Theme")), Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle), SelectedSource = selectedSource @@ -131,7 +131,7 @@ namespace Orchard.Packaging.Controllers { } public ActionResult Harvest(string extensionName, string feedUrl) { - return View("Harvest", new PackagingHarvestViewModel { + return View(new PackagingHarvestViewModel { ExtensionName = extensionName, FeedUrl = feedUrl, Sources = _packagingSourceManager.GetSources(), @@ -155,7 +155,7 @@ namespace Orchard.Packaging.Controllers { if (!model.Sources.Any(src => src.FeedUrl == model.FeedUrl)) { ModelState.AddModelError("FeedUrl", T("May only push directly to one of the configured sources.").ToString()); - return View("Harvest", model); + return View(model); } _packageManager.Push(packageData, model.FeedUrl, model.User, model.Password); diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs index d65a37ff7..beb07096a 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs @@ -56,7 +56,7 @@ namespace Orchard.Users.Controllers { if (_authenticationService.GetAuthenticatedUser() != null) return Redirect("~/"); - return View("LogOn", new LogOnViewModel {Title = "Log On"}); + return View(new LogOnViewModel {Title = "Log On"}); } [HttpPost] @@ -65,7 +65,7 @@ namespace Orchard.Users.Controllers { public ActionResult LogOn(string userNameOrEmail, string password, bool rememberMe, string returnUrl) { var user = ValidateLogOn(userNameOrEmail, password); if (!ModelState.IsValid) { - return View("LogOn", new LogOnViewModel {Title = "Log On"}); + return View(new LogOnViewModel {Title = "Log On"}); } _authenticationService.SignIn(user, rememberMe);