From d00761c13d3c1995bcc9151b3a992fa9dddb193a Mon Sep 17 00:00:00 2001 From: Suha Can Date: Mon, 28 Feb 2011 11:02:33 -0800 Subject: [PATCH] Bug #17392: Create layer without name in command line success. --HG-- branch : dev --- .../Modules/Orchard.Setup/Recipes/blog.recipe.xml | 10 +++++----- .../Orchard.Setup/Recipes/default.recipe.xml | 10 +++++----- .../Orchard.Widgets/Commands/LayerCommands.cs | 13 ++++++------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml index 807171a16..93737f229 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml +++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml @@ -40,11 +40,11 @@ - layer create /Name:"Default" /LayerRule:"true" - layer create /Name:"Authenticated" /LayerRule:"authenticated" - layer create /Name:"Anonymous" /LayerRule:"not authenticated" - layer create /Name:"Disabled" /LayerRule:"false" - layer create /Name:"TheHomepage" /LayerRule:"url '~/'" + layer create Default /LayerRule:"true" + layer create Authenticated /LayerRule:"authenticated" + layer create Anonymous /LayerRule:"not authenticated" + layer create Disabled /LayerRule:"false" + layer create TheHomepage /LayerRule:"url '~/'" blog create /Slug:"blog" /Title:"Blog" /Homepage:true /Description:"This is your Orchard Blog." widget create /Type:"HtmlWidget" /Title:"First Leader Aside" /Zone:"TripelFirst" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true widget create /Type:"HtmlWidget" /Title:"Second Leader Aside" /Zone:"TripelSecond" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml index 62919852a..830bb0793 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml +++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml @@ -36,11 +36,11 @@ - layer create /Name:"Default" /LayerRule:"true" - layer create /Name:"Authenticated" /LayerRule:"authenticated" - layer create /Name:"Anonymous" /LayerRule:"not authenticated" - layer create /Name:"Disabled" /LayerRule:"false" - layer create /Name:"TheHomepage" /LayerRule:"url '~/'" + layer create Default /LayerRule:"true" + layer create Authenticated /LayerRule:"authenticated" + layer create Anonymous /LayerRule:"not authenticated" + layer create Disabled /LayerRule:"false" + layer create TheHomepage /LayerRule:"url '~/'" page create /Slug:"welcome-to-orchard" /Title:"Welcome to Orchard!" /Path:"welcome-to-orchard" /Homepage:true /Publish:true /UseWelcomeText:true widget create /Type:"HtmlWidget" /Title:"First Leader Aside" /Zone:"TripelFirst" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true widget create /Type:"HtmlWidget" /Title:"Second Leader Aside" /Zone:"TripelSecond" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Commands/LayerCommands.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Commands/LayerCommands.cs index 979e7ea0f..5bd705159 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Commands/LayerCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Commands/LayerCommands.cs @@ -18,9 +18,6 @@ namespace Orchard.Widgets.Commands { _membershipService = membershipService; } - [OrchardSwitch] - public string Name { get; set; } - [OrchardSwitch] public string LayerRule { get; set; } @@ -31,11 +28,13 @@ namespace Orchard.Widgets.Commands { public string Owner { get; set; } [CommandName("layer create")] - [CommandHelp("layer create /Name: /LayerRule: [/Description:] [/Owner:]\r\n\t" + "Creates a new layer")] - [OrchardSwitches("Name,LayerRule,Description,Owner")] - public void Create() { + [CommandHelp("layer create /LayerRule: [/Description:] [/Owner:]\r\n\t" + "Creates a new layer")] + [OrchardSwitches("LayerRule,Description,Owner")] + public void Create(string name) { + Context.Output.WriteLine(T("Creating Layer {0}", name)); + IContent layer = _contentManager.Create("Layer", t => { - t.Record.Name = Name; + t.Record.Name = name; t.Record.LayerRule = LayerRule; t.Record.Description = Description ?? String.Empty; });