From 0765f1019ad46dddff4cc29ded31315a0fd63d79 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 26 Apr 2013 10:23:33 -0700 Subject: [PATCH] Fixing ZoneHolding duck typing behavior --HG-- branch : 1.x --- .../ViewModels/AddLocalizationViewModel.cs | 3 ++- .../Orchard.Localization/Views/CultureSelection.cshtml | 5 ++--- src/Orchard/DisplayManagement/Shapes/Shape.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Localization/ViewModels/AddLocalizationViewModel.cs b/src/Orchard.Web/Modules/Orchard.Localization/ViewModels/AddLocalizationViewModel.cs index c5c20330e..c7725c827 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/ViewModels/AddLocalizationViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/ViewModels/AddLocalizationViewModel.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Orchard.ContentManagement; namespace Orchard.Localization.ViewModels { public class AddLocalizationViewModel { @@ -7,6 +8,6 @@ namespace Orchard.Localization.ViewModels { [Required] public string SelectedCulture { get; set; } public IEnumerable SiteCultures { get; set; } - public dynamic Content { get; set; } + public IContent Content { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Views/CultureSelection.cshtml b/src/Orchard.Web/Modules/Orchard.Localization/Views/CultureSelection.cshtml index f5dfb3562..fdc51025c 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Views/CultureSelection.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Localization/Views/CultureSelection.cshtml @@ -1,5 +1,4 @@ -@using Orchard.ContentManagement -@model Orchard.Localization.ViewModels.AddLocalizationViewModel +@model Orchard.Localization.ViewModels.AddLocalizationViewModel @{ Style.Require("LocalizationAdmin"); } @@ -12,6 +11,6 @@
@T("This is the {0} variation of {1}", Html.DropDownList("SelectedCulture", new SelectList(siteCultures, Model.SelectedCulture)), - Html.ItemEditLink((IContent)Model.Content.ContentItem)) + Html.ItemEditLink(Model.Content))
\ No newline at end of file diff --git a/src/Orchard/DisplayManagement/Shapes/Shape.cs b/src/Orchard/DisplayManagement/Shapes/Shape.cs index 2362bd80e..d009d1123 100644 --- a/src/Orchard/DisplayManagement/Shapes/Shape.cs +++ b/src/Orchard/DisplayManagement/Shapes/Shape.cs @@ -72,7 +72,7 @@ namespace Orchard.DisplayManagement.Shapes { return true; } - return false; + return base.TryConvert(binder, out result); } //public class ShapeBehavior : ClayBehavior {