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

Getting media picker working

Browse Source
This commit is contained in:
Shannon
2013-06-10 10:36:59 -02:00
parent 1b59c1ba6e
commit 47d70e858b
20 changed files with 321 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs
View File

@@ -11,10 +11,10 @@ namespace Umbraco.Web.Models.ContentEditing
/// A model representing a basic content item
/// </summary>
[DataContract(Name = "content", Namespace = "")]
public abstract class ContentItemBasic<T>
where T: ContentPropertyBase
public class ContentItemBasic<T>
where T: ContentPropertyBasic
{
protected ContentItemBasic()
public ContentItemBasic()
{
//ensure its not null
_properties = new List<T>();

2
src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
View File

@@ -7,6 +7,8 @@ using System.Linq;
namespace Umbraco.Web.Models.ContentEditing
{
/// <summary>
/// A model representing a content item to be displayed in the back office
/// </summary>

2
src/Umbraco.Web/Models/ContentEditing/ContentItemSave.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Web.Models.ContentEditing
/// <summary>
/// A model representing a content item to be saved
/// </summary>
public class ContentItemSave : ContentItemBasic<ContentPropertyBase>
public class ContentItemSave : ContentItemBasic<ContentPropertyBasic>
{
public ContentItemSave()
{

6
src/Umbraco.Web/Models/ContentEditing/ContentPropertyBase.cs → src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
View File

@@ -7,7 +7,7 @@ namespace Umbraco.Web.Models.ContentEditing
/// Represents a content property to be saved
/// </summary>
[DataContract(Name = "property", Namespace = "")]
public class ContentPropertyBase
public class ContentPropertyBasic
{
[DataMember(Name = "id", IsRequired = true)]
[Required]
@@ -16,7 +16,7 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "value")]
public string Value { get; set; }
protected bool Equals(ContentPropertyBase other)
protected bool Equals(ContentPropertyBasic other)
{
return Id == other.Id;
}
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Models.ContentEditing
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
var other = obj as ContentPropertyBase;
var other = obj as ContentPropertyBasic;
return other != null && Equals(other);
}

2
src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
View File

@@ -7,7 +7,7 @@ namespace Umbraco.Web.Models.ContentEditing
/// <summary>
/// Represents a content property that is displayed in the UI
/// </summary>
public class ContentPropertyDisplay : ContentPropertyBase
public class ContentPropertyDisplay : ContentPropertyBasic
{
[DataMember(Name = "label", IsRequired = true)]
[Required]

2
src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
View File

@@ -7,7 +7,7 @@ namespace Umbraco.Web.Models.ContentEditing
/// <summary>
/// Represents a content property from the database
/// </summary>
internal class ContentPropertyDto : ContentPropertyBase
internal class ContentPropertyDto : ContentPropertyBasic
{
public IDataTypeDefinition DataType { get; set; }
public string Label { get; set; }