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

Fixes U4-1372 by changing the Upload field workaround to use the legacy getProperty instead of the underlying IContentBase object.

Browse Source
This commit is contained in:
Morten Christensen
2013-01-15 09:22:11 -01:00
parent 6efb15fef8
commit d3c10d6033
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs
View File

@@ -1,13 +1,10 @@
using System;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Web;
using System.Xml;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Models;
using umbraco.interfaces;
namespace Umbraco.Web.Strategies.DataTypes
@@ -36,7 +33,7 @@ namespace Umbraco.Web.Strategies.DataTypes
return;
FillProperties(sender.Content, property);
FillProperties(sender, property);
}
}
@@ -49,11 +46,11 @@ namespace Umbraco.Web.Strategies.DataTypes
return;
FillProperties(sender.MediaItem, property);
FillProperties(sender, property);
}
}
private void FillProperties(IContentBase content, global::umbraco.cms.businesslogic.property.Property property)
private void FillProperties(global::umbraco.cms.businesslogic.Content content, global::umbraco.cms.businesslogic.property.Property property)
{
XmlNode uploadFieldConfigNode = global::umbraco.UmbracoSettings.ImageAutoFillImageProperties.SelectSingleNode(string.Format("uploadField [@alias = \"{0}\"]", property.PropertyType.Alias));
@@ -87,14 +84,14 @@ namespace Umbraco.Web.Strategies.DataTypes
}
}
private void UpdateProperty(XmlNode uploadFieldConfigNode, IContentBase content, string propertyAlias, object propertyValue)
private void UpdateProperty(XmlNode uploadFieldConfigNode, global::umbraco.cms.businesslogic.Content content, string propertyAlias, object propertyValue)
{
XmlNode propertyNode = uploadFieldConfigNode.SelectSingleNode(propertyAlias);
if (propertyNode != null && !String.IsNullOrEmpty(propertyNode.FirstChild.Value))
{
if (content.Properties.Contains(propertyNode.FirstChild.Value) && content.Properties[propertyNode.FirstChild.Value] != null)
if (content.GenericProperties.Any(x => x.PropertyType.Alias == propertyNode.FirstChild.Value) && content.getProperty(propertyNode.FirstChild.Value) != null)
{
content.SetValue(propertyNode.FirstChild.Value, propertyValue);
content.getProperty(propertyNode.FirstChild.Value).Value = propertyValue;
}
}
}

6
src/umbraco.cms/businesslogic/media/Media.cs
View File

@@ -303,6 +303,9 @@ namespace umbraco.cms.businesslogic.media
[Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.Save()", false)]
public override void Save()
{
SaveEventArgs e = new SaveEventArgs();
FireBeforeSave(e);
foreach (var property in GenericProperties)
{
if (property.Value == null)
@@ -311,9 +314,6 @@ namespace umbraco.cms.businesslogic.media
MediaItem.SetValue(property.PropertyType.Alias, property.Value);
}
SaveEventArgs e = new SaveEventArgs();
FireBeforeSave(e);
if (!e.Cancel)
{
ApplicationContext.Current.Services.MediaService.Save(MediaItem);

6
src/umbraco.cms/businesslogic/web/Document.cs
View File

@@ -936,6 +936,9 @@ namespace umbraco.cms.businesslogic.web
[Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Save()", false)]
public override void Save()
{
var e = new SaveEventArgs();
FireBeforeSave(e);
foreach (var property in GenericProperties)
{
if (property.Value == null)
@@ -943,9 +946,6 @@ namespace umbraco.cms.businesslogic.web
Content.SetValue(property.PropertyType.Alias, property.Value);
}
var e = new SaveEventArgs();
FireBeforeSave(e);
if (!e.Cancel)
{