From cd39efe61072096493b50d28348e6dbb6676e236 Mon Sep 17 00:00:00 2001 From: loudej Date: Tue, 1 Dec 2009 00:18:59 +0000 Subject: [PATCH] Clean up the usage of ModelTemplate class a bit --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4042780 --- .../Models/CommentsHandler.cs | 2 +- .../Models/DebugLinkProvider.cs | 4 +-- .../Orchard.Media/Models/MediaSettings.cs | 4 +-- .../Orchard.Roles/Models/UserRolesProvider.cs | 4 +-- .../Orchard.Tags/Models/TagsHandler.cs | 2 +- .../Models/Driver/TemplateFilterForRecord.cs | 4 +-- src/Orchard/UI/Models/ModelTemplate.cs | 26 +++++++++---------- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs index 3b9722cd0..cbe520b45 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs @@ -29,7 +29,7 @@ namespace Orchard.Comments.Models { if (context.ContentItem.Has() == false) { return; } - context.Displays.Add(new ModelTemplate { Model = context.ContentItem.Get(), Prefix = String.Empty }); + context.Displays.Add(new ModelTemplate(context.ContentItem.Get())); } protected override void Loading(LoadContentContext context) { diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs index f6c364937..5fccba413 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.UI.Models; namespace Orchard.DevTools.Models { public class DebugLinkProvider : ContentProvider { protected override void GetDisplays(GetDisplaysContext context) { - context.Displays.Add(new ModelTemplate { Model = new ShowDebugLink { ContentItem = context.ContentItem } }); + context.Displays.Add(new ModelTemplate(new ShowDebugLink { ContentItem = context.ContentItem })); } protected override void GetEditors(GetEditorsContext context) { - context.Editors.Add(new ModelTemplate { Model = new ShowDebugLink { ContentItem = context.ContentItem } }); + context.Editors.Add(new ModelTemplate(new ShowDebugLink { ContentItem = context.ContentItem })); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs b/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs index 64c47bde8..5ec40b56a 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs +++ b/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs @@ -28,7 +28,7 @@ namespace Orchard.Media.Models { if (model == null) return; - context.Editors.Add(ModelTemplate.For(model.Record, "MediaSettings")); + context.Editors.Add(new ModelTemplate(model.Record, "MediaSettings")); } protected override void UpdateEditors(UpdateContentContext context) { @@ -37,7 +37,7 @@ namespace Orchard.Media.Models { return; context.Updater.TryUpdateModel(model.Record, "MediaSettings", null, null); - context.Editors.Add(ModelTemplate.For(model.Record, "MediaSettings")); + context.Editors.Add(new ModelTemplate(model.Record, "MediaSettings")); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesProvider.cs b/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesProvider.cs index 14b51b0a5..c1d317f4c 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesProvider.cs +++ b/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesProvider.cs @@ -46,7 +46,7 @@ namespace Orchard.Roles.Models { Roles = roles.ToList(), }; - context.Editors.Add(ModelTemplate.For(viewModel, "UserRoles")); + context.Editors.Add(new ModelTemplate(viewModel, "UserRoles")); } } @@ -71,7 +71,7 @@ namespace Orchard.Roles.Models { } } - context.Editors.Add(ModelTemplate.For(viewModel, "UserRoles")); + context.Editors.Add(new ModelTemplate(viewModel, "UserRoles")); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs index 09f6afff1..ddf777977 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs @@ -31,7 +31,7 @@ namespace Orchard.Tags.Models { if (context.ContentItem.Has() == false) { return; } - context.Displays.Add(new ModelTemplate { Model = context.ContentItem.Get(), Prefix = String.Empty }); + context.Displays.Add(new ModelTemplate(context.ContentItem.Get())); } protected override void Loading(LoadContentContext context) { diff --git a/src/Orchard/Models/Driver/TemplateFilterForRecord.cs b/src/Orchard/Models/Driver/TemplateFilterForRecord.cs index 90e63cc2b..30b307dee 100644 --- a/src/Orchard/Models/Driver/TemplateFilterForRecord.cs +++ b/src/Orchard/Models/Driver/TemplateFilterForRecord.cs @@ -10,12 +10,12 @@ namespace Orchard.Models.Driver { } protected override void GetEditors(GetEditorsContext context, ContentPart part) { - context.Editors.Add(ModelTemplate.For(part.Record, _prefix)); + context.Editors.Add(new ModelTemplate(part.Record, _prefix)); } protected override void UpdateEditors(UpdateContentContext context, ContentPart part) { context.Updater.TryUpdateModel(part.Record, _prefix, null, null); - context.Editors.Add(ModelTemplate.For(part.Record, _prefix)); + context.Editors.Add(new ModelTemplate(part.Record, _prefix)); } } } diff --git a/src/Orchard/UI/Models/ModelTemplate.cs b/src/Orchard/UI/Models/ModelTemplate.cs index f385fe8d5..3a162040b 100644 --- a/src/Orchard/UI/Models/ModelTemplate.cs +++ b/src/Orchard/UI/Models/ModelTemplate.cs @@ -1,22 +1,20 @@ namespace Orchard.UI.Models { public class ModelTemplate { + public ModelTemplate() + : this(null) { + } + public ModelTemplate(object model) + : this(model, string.Empty) { + + } + public ModelTemplate(object model, string prefix) { + Model = model; + Prefix = prefix; + } + public object Model { get; set; } public string Prefix { get; set; } public string TemplateName { get; set; } - public static ModelTemplate For(TModel model, string prefix) { - return new ModelTemplate { - Model = model, - Prefix = prefix, - }; - } - - public static ModelTemplate For(TModel model, string prefix, string editorTemplateName) { - return new ModelTemplate { - Model = model, - Prefix = prefix, - TemplateName = editorTemplateName, - }; - } } }