Merge

--HG--
branch : dev

src/Orchard.Web/Core/Contents/AdminMenu.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
+using Orchard.Core.Contents.Settings;
 using Orchard.Localization;
 using Orchard.UI.Navigation;
 
@@ -22,7 +23,7 @@ namespace Orchard.Core.Contents {
 
             builder.Add(T("Content"), "2", menu => {
                 menu.Add(T("Manage Content"), "1", item => item.Action("List", "Admin", new { area = "Contents", id = "" }));
-                foreach (var contentTypeDefinition in contentTypeDefinitions) {
+                foreach (var contentTypeDefinition in contentTypeDefinitions.Where(ctd => ctd.Settings.GetModel<ContentTypeSettings>().Creatable)) {
                     var ci = _contentManager.New(contentTypeDefinition.Name);
                     var cim = _contentManager.GetItemMetadata(ci);
                     var createRouteValues = cim.CreateRouteValues;

src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs

@@ -0,0 +1,8 @@
+namespace Orchard.Core.Contents.Settings {
+    public class ContentTypeSettings {
+        /// <summary>
+        /// This setting is used to display a Content Type in Content Mamagement menu like
+        /// </summary>
+        public bool Creatable { get; set; }
+    }
+}

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -84,6 +84,7 @@
     <Compile Include="Contents\Handlers\ContentsHandler.cs" />
     <Compile Include="Contents\Permissions.cs" />
     <Compile Include="Contents\Routes.cs" />
+    <Compile Include="Contents\Settings\ContentTypeSettings.cs" />
     <Compile Include="Contents\ViewModels\PublishContentViewModel.cs" />
     <Compile Include="Localization\ViewModels\EditLocalizationViewModel.cs" />
     <Compile Include="PublishLater\DataMigrations\PublishLaterDataMigration.cs" />

src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/Orchard.Web/Modules/Orchard.Pages/DataMigrations/PageDataMigration.cs

@@ -16,5 +16,15 @@ namespace Orchard.Pages.DataMigrations {
             
             return 1;
         }
+
+
+        public int UpdateFrom1() {
+            ContentDefinitionManager.AlterTypeDefinition("Page",
+                cfg => cfg
+                    .WithSetting("ContentTypeSettings.Creatable", "true")
+            );
+
+            return 2;
+        }
     }
 }