From 794f9871bc216aee16474b43165dc23959c14fb5 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 14 Oct 2010 17:22:10 -0700 Subject: [PATCH] Reverting a few fixes --HG-- branch : dev --- src/Orchard.Web/Core/Contents/Controllers/AdminController.cs | 2 +- .../Orchard.Experimental/Controllers/CommandsController.cs | 2 +- .../Orchard.Packaging/Controllers/GalleryController.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index 77e3b28b4..960fa7c85 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -198,7 +198,7 @@ namespace Orchard.Core.Contents.Controllers { ActionResult CreatableTypeList() { var list = Shape.List(); - list.AddRange(GetCreatableTypes()); + list.AddRange("CreatableTypeList", GetCreatableTypes()); var viewModel = Shape.ViewModel() .ContentTypes(list); diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs index 720179bec..ed8aeed65 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(new CommandsExecuteViewModel()); + return View("Execute", new CommandsExecuteViewModel()); } [HttpPost] diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs index e94dd01aa..ecec1329b 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs @@ -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(new PackagingModulesViewModel { + return View("Modules", 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(new PackagingModulesViewModel { + return View("Themes", 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