diff --git a/Directory.Build.props b/Directory.Build.props index ab18670f0..fb8eba8a8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 9.0.0 + 9.1.0-alpha1 Piranha CMS Piranha CMS Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj b/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj index f0efd381f..e9ed461e8 100644 --- a/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj +++ b/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj @@ -5,10 +5,6 @@ Piranha CMS middleware components for AspNetCore - - 9.0.1 - - true diff --git a/core/Piranha.AttributeBuilder/ContentTypeBuilder.cs b/core/Piranha.AttributeBuilder/ContentTypeBuilder.cs index 6a436d192..73eb0ca9d 100644 --- a/core/Piranha.AttributeBuilder/ContentTypeBuilder.cs +++ b/core/Piranha.AttributeBuilder/ContentTypeBuilder.cs @@ -285,7 +285,8 @@ private ContentGroup GetContentGroup(Type type) Id = attr.Id, Title = attr.Title, CLRType = type.Name, // type.AssemblyQualifiedName, - Icon = attr.Icon + Icon = attr.Icon, + IsHidden = attr.IsHidden }; } return null; @@ -323,13 +324,9 @@ private ContentType GetContentType(Type type) Group = group.Id, UseExcerpt = attr.UseExcerpt, UsePrimaryImage = attr.UsePrimaryImage, - // - // TODO - // - // Categories & Tags will be removed in this version as they - // need to be localized properly and handled in the manager. - UseCategory = false, // typeof(ICategorizedContent).IsAssignableFrom(type), - UseTags = false, // typeof(ITaggedContent).IsAssignableFrom(type), + UseBlocks = typeof(IBlockContent).IsAssignableFrom(type), + UseCategory = typeof(ICategorizedContent).IsAssignableFrom(type), + UseTags = typeof(ITaggedContent).IsAssignableFrom(type), CustomEditors = GetEditors(type), Regions = GetRegions(type) }; diff --git a/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj b/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj index 9b6a7d588..6ca374599 100644 --- a/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj +++ b/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj @@ -5,10 +5,6 @@ Library for defining content types with Attributes - - 9.0.1 - - true diff --git a/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj b/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj index cf40646fd..5596a36d4 100644 --- a/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj +++ b/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj @@ -6,10 +6,6 @@ Localization for the Piranha CMS manager panel - - 9.0.1 - - true diff --git a/core/Piranha.Manager/Areas/Manager/Pages/ContentEdit.cshtml b/core/Piranha.Manager/Areas/Manager/Pages/ContentEdit.cshtml index 83fff5168..0fdd23d24 100644 --- a/core/Piranha.Manager/Areas/Manager/Pages/ContentEdit.cshtml +++ b/core/Piranha.Manager/Areas/Manager/Pages/ContentEdit.cshtml @@ -1,6 +1,7 @@ @page "~/manager/content/{action}/{contentType}/{id?}/{langId?}" @model ContentListViewModel @inject ManagerLocalizer Localizer +@inject Piranha.Config Config @{ ViewBag.Title = "Add/Edit"; ViewBag.MenuItem = "Add/Edit"; @@ -74,7 +75,12 @@
-