mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Fix merge conflicts...
--HG-- branch : dev
This commit is contained in:
@@ -1,16 +1,8 @@
|
|||||||
using Orchard.ContentManagement.MetaData.Builders;
|
namespace Orchard.Core.Contents.Settings {
|
||||||
|
|
||||||
namespace Orchard.Core.Contents.Settings {
|
|
||||||
public class ContentTypeSettings {
|
public class ContentTypeSettings {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This setting is used to display a Content Type in Content Mamagement menu like
|
/// This setting is used to display a Content Type in Content Mamagement menu like
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool Creatable { get; set; }
|
public bool Creatable { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class MetaDataExtensions {
|
|
||||||
public static ContentTypeDefinitionBuilder Creatable(this ContentTypeDefinitionBuilder builder, bool creatable = true) {
|
|
||||||
return builder.WithSetting(typeof(ContentTypeSettings).Name + ".Creatable", creatable.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -7,6 +7,7 @@ using Orchard.ContentManagement.Drivers;
|
|||||||
using Orchard.ContentManagement.MetaData;
|
using Orchard.ContentManagement.MetaData;
|
||||||
using Orchard.ContentManagement.MetaData.Models;
|
using Orchard.ContentManagement.MetaData.Models;
|
||||||
using Orchard.ContentTypes.ViewModels;
|
using Orchard.ContentTypes.ViewModels;
|
||||||
|
using Orchard.Core.Contents.Extensions;
|
||||||
using Orchard.Core.Contents.Settings;
|
using Orchard.Core.Contents.Settings;
|
||||||
using Orchard.Localization;
|
using Orchard.Localization;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user