lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Reverting a few fixes

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-14 17:22:10 -07:00
parent f30ec97a20
commit 794f9871bc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -198,7 +198,7 @@ namespace Orchard.Core.Contents.Controllers {
ActionResult CreatableTypeList() { ActionResult CreatableTypeList() {
var list = Shape.List(); var list = Shape.List();
list.AddRange(GetCreatableTypes()); list.AddRange("CreatableTypeList", GetCreatableTypes());
var viewModel = Shape.ViewModel() var viewModel = Shape.ViewModel()
.ContentTypes(list); .ContentTypes(list);

2
src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs
View File

@@ -22,7 +22,7 @@ namespace Orchard.Experimental.Controllers {
} }
public ActionResult Execute() { public ActionResult Execute() {
return View(new CommandsExecuteViewModel()); return View("Execute", new CommandsExecuteViewModel());
} }
[HttpPost] [HttpPost]

4
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
View File

@@ -107,7 +107,7 @@ namespace Orchard.Packaging.Controllers {
public ActionResult Modules(Guid? sourceId) { public ActionResult Modules(Guid? sourceId) {
var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault(); 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")), 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), Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle),
SelectedSource = selectedSource SelectedSource = selectedSource
@@ -117,7 +117,7 @@ namespace Orchard.Packaging.Controllers {
public ActionResult Themes(Guid? sourceId) { public ActionResult Themes(Guid? sourceId) {
var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault(); 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")), Modules = _packagingSourceManager.GetModuleList(selectedSource).Where(p => p.SyndicationItem.Categories.Any(c => c.Name == "Orchard Theme")),
Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle), Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle),
SelectedSource = selectedSource SelectedSource = selectedSource