swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
kjac
2014-05-29 11:16:01 +02:00
parent 537abea717 e46e5c279f
commit aafeebfc62
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
+3 -3
View File
@@ -29,7 +29,7 @@ namespace Archetype.Models
{
var property = GetProperty(propertyAlias);
if (property == null || string.IsNullOrEmpty(property.Value.ToString()))
if (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()))
return default(T);
return property.GetValue<T>();
@@ -43,7 +43,7 @@ namespace Archetype.Models
public bool HasValue(string propertyAlias)
{
var property = GetProperty(propertyAlias);
if (property == null)
if (property == null || property.Value == null)
return false;
return !string.IsNullOrEmpty(property.Value.ToString());
@@ -57,4 +57,4 @@ namespace Archetype.Models
#endregion
}
}
}