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

Added moq (need to replace all rhino mock later) allowing us to nicely mock umbraco settings, fixing up more unit tests.

Browse Source
This commit is contained in:
Shannon
2013-09-17 00:14:15 +10:00
parent 48db556d1b
commit 86a5d16e25
38 changed files with 232 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
View File

@@ -97,16 +97,16 @@ namespace Umbraco.Web.PropertyEditors
private static void ResetProperties(IImagingAutoFillUploadField uploadFieldConfigNode, IContentBase content)
{
if (content.Properties[uploadFieldConfigNode.WidthFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.WidthFieldAlias))
content.Properties[uploadFieldConfigNode.WidthFieldAlias].Value = string.Empty;
if (content.Properties[uploadFieldConfigNode.HeightFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.HeightFieldAlias))
content.Properties[uploadFieldConfigNode.HeightFieldAlias].Value = string.Empty;
if (content.Properties[uploadFieldConfigNode.LengthFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.LengthFieldAlias))
content.Properties[uploadFieldConfigNode.LengthFieldAlias].Value = string.Empty;
if (content.Properties[uploadFieldConfigNode.ExtensionFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.ExtensionFieldAlias))
content.Properties[uploadFieldConfigNode.ExtensionFieldAlias].Value = string.Empty;
}
@@ -114,16 +114,16 @@ namespace Umbraco.Web.PropertyEditors
{
var size = um.SupportsResizing ? (Size?)um.GetDimensions() : null;
if (content.Properties[uploadFieldConfigNode.WidthFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.WidthFieldAlias))
content.Properties[uploadFieldConfigNode.WidthFieldAlias].Value = size.HasValue ? size.Value.Width.ToInvariantString() : string.Empty;
if (content.Properties[uploadFieldConfigNode.HeightFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.HeightFieldAlias))
content.Properties[uploadFieldConfigNode.HeightFieldAlias].Value = size.HasValue ? size.Value.Height.ToInvariantString() : string.Empty;
if (content.Properties[uploadFieldConfigNode.LengthFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.LengthFieldAlias))
content.Properties[uploadFieldConfigNode.LengthFieldAlias].Value = um.Length;
if (content.Properties[uploadFieldConfigNode.ExtensionFieldAlias] != null)
if (content.Properties.Contains(uploadFieldConfigNode.ExtensionFieldAlias))
content.Properties[uploadFieldConfigNode.ExtensionFieldAlias].Value = um.Extension;
}