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

Grid2: Reverted GridValue amends, as this is used specifically for Grid v1 with Deploy.

Browse Source
This commit is contained in:
leekelleher
2018-05-20 16:08:16 +01:00
parent ab08f1fc06
commit 4702bdab33
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Core/Models/GridValue.cs
+7 -19
View File
@@ -37,10 +37,10 @@ namespace Umbraco.Core.Models
public IEnumerable<GridArea> Areas { get; set; }
[JsonProperty("styles")]
public JToken Styles { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Styles { get; set; }
[JsonProperty("config")]
public JToken Config { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Config { get; set; }
}
public class GridArea
@@ -52,46 +52,34 @@ namespace Umbraco.Core.Models
public IEnumerable<GridControl> Controls { get; set; }
[JsonProperty("styles")]
public JToken Styles { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Styles { get; set; }
[JsonProperty("config")]
public JToken Config { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Config { get; set; }
}
public class GridControl
{
[JsonProperty("value")]
public JToken Value { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Value { get; set; }
[JsonProperty("editor")]
public GridEditor Editor { get; set; }
[JsonProperty("styles")]
public JToken Styles { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Styles { get; set; }
[JsonProperty("config")]
public JToken Config { get; set; } // FIXME: This property will become an`IPublishedElement`
public JToken Config { get; set; }
}
public class GridEditor
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("alias")]
public string Alias { get; set; }
[JsonProperty("view")]
public string View { get; set; }
[JsonProperty("render")]
public string Render { get; set; }
[JsonProperty("icon")]
public string Icon { get; set; }
[JsonProperty("config")]
public IDictionary<string, object> Config { get; set; }
}
}
}