From d07a59ed51a4a93719e318b3c05f7e05405b0f9d Mon Sep 17 00:00:00 2001 From: suhacan Date: Fri, 4 Dec 2009 22:53:52 +0000 Subject: [PATCH] - Editing zoneName passed for display/edit views for the devtools drivers so it's rendered last. --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043232 --- .../Packages/Orchard.DevTools/Models/DebugLinkProvider.cs | 4 ++-- src/Orchard/Models/DefaultContentManager.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs index 56e37c701..5940d49e3 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs +++ b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs @@ -4,10 +4,10 @@ using Orchard.Models.ViewModels; namespace Orchard.DevTools.Models { public class DebugLinkProvider : ContentProvider { protected override void GetDisplayViewModel(GetDisplayViewModelContext context) { - context.AddDisplay(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "last", Position = "10" }); + context.AddDisplay(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "10" }); } protected override void GetEditorViewModel(GetEditorViewModelContext context) { - context.AddEditor(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "last", Position = "10" }); + context.AddEditor(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "10" }); } } } diff --git a/src/Orchard/Models/DefaultContentManager.cs b/src/Orchard/Models/DefaultContentManager.cs index 3c5c299e8..e98d21f7f 100644 --- a/src/Orchard/Models/DefaultContentManager.cs +++ b/src/Orchard/Models/DefaultContentManager.cs @@ -169,6 +169,7 @@ namespace Orchard.Models { private static IEnumerable OrderTemplates(IEnumerable templates) { var comparer = new PositionComparer(); + //TODO: rethink this comparison because it adds a requirement on naming zones. return templates.OrderBy(x => (x.ZoneName ?? "*") + "." + (x.Position ?? "5"), comparer); }