yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert change to Umbraco Helper as caused issues with the itemRender not being

Browse Source 
able to process fallback or formating options.
This commit is contained in:
pgregorynz
2012-11-07 15:20:19 -10:00
parent 1bceb746fa
commit 1a969d76e1
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -249,13 +249,14 @@ namespace Umbraco.Web
attributesForItem.Add(i.Key, i.Value);
}
var item = new Item()
{
NodeId = currentPage.Id.ToString(),
Field = fieldAlias,
TextIfEmpty = altText,
LegacyAttributes = attributesForItem
};
var item = new Item()
{
//NodeId = currentPage.Id.ToString();
Field = fieldAlias,
TextIfEmpty = altText,
LegacyAttributes = attributesForItem
};
var containerPage = new FormlessPage();
containerPage.Controls.Add(item);

6
src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
View File

@@ -107,7 +107,7 @@ namespace umbraco.presentation.templateControls
// content class to lookup field items
try
{
tempElementContent = GetContentFromDatabase(item.Attributes, tempNodeId.Value, currentField);
tempElementContent = GetContentFromDatabase(item.LegacyAttributes, tempNodeId.Value, currentField);
}
catch
{
@@ -248,7 +248,7 @@ namespace umbraco.presentation.templateControls
/// <param name="nodeIdInt">The node id.</param>
/// <param name="currentField">The field that should be fetched.</param>
/// <returns>The contents of the <paramref name="currentField"/> from the <paramref name="nodeIdInt"/> content object</returns>
protected virtual string GetContentFromDatabase(AttributeCollection itemAttributes, int nodeIdInt, string currentField)
protected virtual string GetContentFromDatabase(AttributeCollectionAdapter itemAttributes, int nodeIdInt, string currentField)
{
Content c = new Content(nodeIdInt);
@@ -256,7 +256,7 @@ namespace umbraco.presentation.templateControls
if (property == null)
throw new ArgumentException(String.Format("Could not find property {0} of node {1}.", currentField, nodeIdInt));
item umbItem = new item(property.Value.ToString(), new AttributeCollectionAdapter(itemAttributes));
item umbItem = new item(property.Value.ToString(), itemAttributes);
string tempElementContent = umbItem.FieldContent;
// If the current content object is a document object, we'll only output it if it's published