lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added support for reusing the same field in a single snippet file.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-11-24 23:19:06 +01:00
parent e5bb771be1
commit 37550593d4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Layouts/Helpers/SnippetHtmlExtensions.cs
View File

@@ -8,7 +8,7 @@ using Orchard.Localization;
namespace Orchard.Layouts.Helpers { namespace Orchard.Layouts.Helpers {
public static class SnippetHtmlExtensions { public static class SnippetHtmlExtensions {
public static SnippetFieldDescriptorBuilder SnippetField(this HtmlHelper htmlHelper, string name, string type) { public static SnippetFieldDescriptorBuilder SnippetField(this HtmlHelper htmlHelper, string name, string type = null) {
var shape = (dynamic) htmlHelper.ViewData.Model; var shape = (dynamic) htmlHelper.ViewData.Model;
return new SnippetFieldDescriptorBuilder(shape) return new SnippetFieldDescriptorBuilder(shape)

5
src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs
View File

@@ -141,7 +141,10 @@ namespace Orchard.Layouts.Providers {
// Execute the shape and intercept calls to the Html.SnippetField method. // Execute the shape and intercept calls to the Html.SnippetField method.
var descriptor = new SnippetDescriptor(); var descriptor = new SnippetDescriptor();
shape.DescriptorRegistrationCallback = (Action<SnippetFieldDescriptor>) (fieldDescriptor => { shape.DescriptorRegistrationCallback = (Action<SnippetFieldDescriptor>) (fieldDescriptor => {
descriptor.Fields.Add(fieldDescriptor); var existingDescriptor = descriptor.Fields.SingleOrDefault(x => x.Name == fieldDescriptor.Name); // Not using Dictionary, as that will break rendering the view for some obscure reason.
if (existingDescriptor == null)
descriptor.Fields.Add(fieldDescriptor);
if (fieldDescriptor.DisplayName == null) if (fieldDescriptor.DisplayName == null)
fieldDescriptor.DisplayName = new LocalizedString(fieldDescriptor.Name); fieldDescriptor.DisplayName = new LocalizedString(fieldDescriptor.Name);