diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AlterContentTypeTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AlterContentTypeTable.cs new file mode 100644 index 0000000000..bda73a1387 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AlterContentTypeTable.cs @@ -0,0 +1,43 @@ +using System; +using System.Data; +using System.Linq; +using Umbraco.Core.Configuration; +using Umbraco.Core.Logging; +using Umbraco.Core.Models.Rdbms; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven +{ + [Migration("7.2.0", 1, GlobalSettings.UmbracoMigrationName)] + public class AlterContentTypeTable : MigrationBase + { + public override void Up() + { + if (Context == null || Context.Database == null) return; + + Upgrade(); + + } + + private void Initial() + { + //new container config col + Alter.Table("cmsContentType").AddColumn("containerConfig").AsString().Nullable(); + } + + public override void Down() + { + Delete.Column("containerConfig").FromTable("cmsContentType"); + } + + /// + /// A custom class to map to so that we can linq to it easily without dynamics + /// + private class PropertyTypeReferenceDto + { + public int NodeId { get; set; } + public int PropertyTypeId { get; set; } + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index b48de35a4e..365769c2fe 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -390,6 +390,7 @@ + diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index 03a91e739c..7a9ba379bd 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.Editors /// An API controller used for dealing with content types /// [PluginController("UmbracoApi")] - public class ContentTypeController : ContentAndMediaTypeBaseController + public class ContentTypeController : ContentTypeControllerBase { private ICultureDictionary _cultureDictionary; diff --git a/src/Umbraco.Web/Editors/ContentAndMediaTypeBaseController.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs similarity index 95% rename from src/Umbraco.Web/Editors/ContentAndMediaTypeBaseController.cs rename to src/Umbraco.Web/Editors/ContentTypeControllerBase.cs index 8a57ce921d..110b1a5a7f 100644 --- a/src/Umbraco.Web/Editors/ContentAndMediaTypeBaseController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs @@ -15,12 +15,12 @@ namespace Umbraco.Web.Editors /// Am abstract API controller providing functionality used for dealing with content and media types /// [PluginController("UmbracoApi")] - public abstract class ContentAndMediaTypeBaseController : UmbracoAuthorizedJsonController + public abstract class ContentTypeControllerBase : UmbracoAuthorizedJsonController { /// /// Constructor /// - public ContentAndMediaTypeBaseController() + public ContentTypeControllerBase() : this(UmbracoContext.Current) { } @@ -29,7 +29,7 @@ namespace Umbraco.Web.Editors /// Constructor /// /// - public ContentAndMediaTypeBaseController(UmbracoContext umbracoContext) + public ContentTypeControllerBase(UmbracoContext umbracoContext) : base(umbracoContext) { } diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs index 3d60479387..e8cad40803 100644 --- a/src/Umbraco.Web/Editors/MediaTypeController.cs +++ b/src/Umbraco.Web/Editors/MediaTypeController.cs @@ -21,7 +21,7 @@ namespace Umbraco.Web.Editors /// An API controller used for dealing with media types /// [PluginController("UmbracoApi")] - public class MediaTypeController : ContentAndMediaTypeBaseController + public class MediaTypeController : ContentTypeControllerBase { /// /// Constructor