Fixing Setting's tokens

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-09-19 15:02:49 -07:00
parent caab31f881
commit 7fb5905b47
@@ -35,10 +35,10 @@ namespace Orchard.Core.Settings.Tokens {
; ;
// Token descriptors for fields // Token descriptors for fields
var customSettingsPart = _contentDefinitionManager.GetPartDefinition("Site"); var customSettingsPart = _contentDefinitionManager.GetTypeDefinition("Site");
if (customSettingsPart != null && customSettingsPart.Fields.Any()) { if (customSettingsPart != null && customSettingsPart.Parts.SelectMany(x => x.PartDefinition.Fields).Any()) {
var partContext = context.For("Site"); var partContext = context.For("Site");
foreach (var partField in customSettingsPart.Fields) { foreach (var partField in customSettingsPart.Parts.SelectMany(x => x.PartDefinition.Fields)) {
var field = partField; var field = partField;
var tokenName = field.Name; var tokenName = field.Name;
@@ -63,8 +63,8 @@ namespace Orchard.Core.Settings.Tokens {
if (context.Target == "Site") { if (context.Target == "Site") {
// is there a content available in the context ? // is there a content available in the context ?
if (forContent.Data != null && forContent.Data.ContentItem != null) { if (forContent.Data != null && forContent.Data.ContentItem != null) {
var customSettingsPart = _contentDefinitionManager.GetPartDefinition("Site"); var customSettingsPart = _contentDefinitionManager.GetTypeDefinition("Site");
foreach (var partField in customSettingsPart.Fields) { foreach (var partField in customSettingsPart.Parts.SelectMany(x => x.PartDefinition.Fields)) {
var field = partField; var field = partField;
var tokenName = partField.Name; var tokenName = partField.Name;
forContent.Token( forContent.Token(