diff --git a/deploy.cmd b/deploy.cmd index 53142d03e..151965c59 100644 --- a/deploy.cmd +++ b/deploy.cmd @@ -68,10 +68,8 @@ IF NOT DEFINED MSBUILD_PATH ( echo Handling .NET Web Application deployment. :: 1. Restore NuGet packages -IF /I "" NEQ "" ( - call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\" - IF !ERRORLEVEL! NEQ 0 goto error -) +call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\src\Orchard.sln" +IF !ERRORLEVEL! NEQ 0 goto error :: 2. Build to the temporary path call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Orchard.proj" /t:Precompiled /v:m diff --git a/src/Gulpfile.js b/src/Gulpfile.js index c050aeffa..47742cbde 100644 --- a/src/Gulpfile.js +++ b/src/Gulpfile.js @@ -11,6 +11,7 @@ var fs = require("fs"), sourcemaps = require("gulp-sourcemaps"), less = require("gulp-less"), cssnano = require("gulp-cssnano"), + sass = require("gulp-sass"), typescript = require("gulp-typescript"), uglify = require("gulp-uglify"), rename = require("gulp-rename"), @@ -131,7 +132,7 @@ function createAssetGroupTask(assetGroup, doRebuild) { function buildCssPipeline(assetGroup, doConcat, doRebuild) { assetGroup.inputPaths.forEach(function (inputPath) { var ext = path.extname(inputPath).toLowerCase(); - if (ext !== ".less" && ext !== ".css") + if (ext !== ".less" && ext !== ".scss" && ext !== ".css") throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'."; }); var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true; @@ -173,6 +174,9 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) { .pipe(plumber()) .pipe(gulpif(generateSourceMaps, sourcemaps.init())) .pipe(gulpif("*.less", less())) + .pipe(gulpif("*.scss", sass({ + precision: 10 + }))) .pipe(gulpif(doConcat, concat(assetGroup.outputFileName))) .pipe(header( "/*\n" + diff --git a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs index 2e3d2f714..1ce9e62ce 100644 --- a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs +++ b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Profile/Properties/AssemblyInfo.cs b/src/Orchard.Profile/Properties/AssemblyInfo.cs index a420575c1..3e5c24634 100644 --- a/src/Orchard.Profile/Properties/AssemblyInfo.cs +++ b/src/Orchard.Profile/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Specs/Boolean.feature b/src/Orchard.Specs/Boolean.feature index 9104dc5a3..5335a953f 100644 --- a/src/Orchard.Specs/Boolean.feature +++ b/src/Orchard.Specs/Boolean.feature @@ -53,7 +53,7 @@ Scenario: Creating and using Boolean fields And I go to "Admin/Contents/Create/Event" Then I should see "Check if the event is active" - # The default value should be used on creation + # The default value should be proposed on creation When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | @@ -63,40 +63,14 @@ Scenario: Creating and using Boolean fields Then I should see "checked=\"checked\"" # The value should be required - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].BooleanFieldSettings.Optional | false | - | Fields[0].BooleanFieldSettings.DefaultValue | Neutral | - And I fill in - | name | value | - | Fields[0].BooleanFieldSettings.NotSetLabel | May be | - And I fill in - | name | value | - | Fields[0].BooleanFieldSettings.SelectionMode | Radiobutton | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Active.Value | | - And I hit "Save" - Then I should see "The field Active is mandatory." - - # If required and no value, the default value should be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].BooleanFieldSettings.Optional | false | - | Fields[0].BooleanFieldSettings.DefaultValue | True | - And I fill in - | name | value | - | Fields[0].BooleanFieldSettings.SelectionMode | Dropdown list | And I hit "Save" And I go to "Admin/Contents/Create/Event" And I fill in | name | value | | Event.Active.Value | | And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - And I should see "selected=\"selected\" value=\"true\"" \ No newline at end of file + Then I should see "The field Active is mandatory." \ No newline at end of file diff --git a/src/Orchard.Specs/Boolean.feature.cs b/src/Orchard.Specs/Boolean.feature.cs index 5eddd627f..937fa3e32 100644 --- a/src/Orchard.Specs/Boolean.feature.cs +++ b/src/Orchard.Specs/Boolean.feature.cs @@ -193,90 +193,25 @@ this.ScenarioSetup(scenarioInfo); table6.AddRow(new string[] { "Fields[0].BooleanFieldSettings.Optional", "false"}); - table6.AddRow(new string[] { - "Fields[0].BooleanFieldSettings.DefaultValue", - "Neutral"}); #line 67 testRunner.And("I fill in", ((string)(null)), table6, "And "); +#line 70 + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 71 + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table7.AddRow(new string[] { - "Fields[0].BooleanFieldSettings.NotSetLabel", - "May be"}); -#line 71 + "Event.Active.Value", + ""}); +#line 72 testRunner.And("I fill in", ((string)(null)), table7, "And "); -#line hidden - TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table8.AddRow(new string[] { - "Fields[0].BooleanFieldSettings.SelectionMode", - "Radiobutton"}); -#line 74 - testRunner.And("I fill in", ((string)(null)), table8, "And "); -#line 77 +#line 75 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 78 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table9.AddRow(new string[] { - "Event.Active.Value", - ""}); -#line 79 - testRunner.And("I fill in", ((string)(null)), table9, "And "); -#line 82 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 83 +#line 76 testRunner.Then("I should see \"The field Active is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 86 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table10.AddRow(new string[] { - "Fields[0].BooleanFieldSettings.Optional", - "false"}); - table10.AddRow(new string[] { - "Fields[0].BooleanFieldSettings.DefaultValue", - "True"}); -#line 87 - testRunner.And("I fill in", ((string)(null)), table10, "And "); -#line hidden - TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table11.AddRow(new string[] { - "Fields[0].BooleanFieldSettings.SelectionMode", - "Dropdown list"}); -#line 91 - testRunner.And("I fill in", ((string)(null)), table11, "And "); -#line 94 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 95 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table12.AddRow(new string[] { - "Event.Active.Value", - ""}); -#line 96 - testRunner.And("I fill in", ((string)(null)), table12, "And "); -#line 99 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 100 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 101 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 102 - testRunner.And("I should see \"selected=\\\"selected\\\" value=\\\"true\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden this.ScenarioCleanup(); } diff --git a/src/Orchard.Specs/DateTime.feature b/src/Orchard.Specs/DateTime.feature index 00c848706..d5861da70 100644 --- a/src/Orchard.Specs/DateTime.feature +++ b/src/Orchard.Specs/DateTime.feature @@ -139,67 +139,22 @@ Scenario: Creating and using Date fields When I hit "Save" Then I should see "Date of the event is required." - # If not required and no value, the default value should be used + # The default value should be proposed on creation When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].DateTimeFieldSettings.Display | DateAndTime | - | Fields[0].DateTimeFieldSettings.Required | false | - | Fields[0].DateTimeFieldSettings.Editor.Date | 01/31/2012 | - | Fields[0].DateTimeFieldSettings.Editor.Time | 11:00 AM | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - Then I should see "Event.EventDate.Editor.Date" - When I fill in - | name | value | - | Event.EventDate.Editor.Date | | - | Event.EventDate.Editor.Time | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Date of the event" - And I should see "1/31/2012 11:00" - - # If required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].DateTimeFieldSettings.Display | DateAndTime | - | Fields[0].DateTimeFieldSettings.Required | true | - | Fields[0].DateTimeFieldSettings.Editor.Date | 01/31/2012 | + | Fields[0].DateTimeFieldSettings.Editor.Date | 01/31/2016 | | Fields[0].DateTimeFieldSettings.Editor.Time | 10:00 AM | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "Event.EventDate.Editor.Date" - When I fill in - | name | value | - | Event.EventDate.Editor.Date | | - | Event.EventDate.Editor.Time | | - And I hit "Save" + When I hit "Save" And I am redirected Then I should see "Your Event has been created." When I go to "Admin/Contents/List" Then I should see "Date of the event" - And I should see "1/31/2012 10:00" - - # If required and the default value is incomplete, the value should be required - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].DateTimeFieldSettings.Display | DateAndTime | - | Fields[0].DateTimeFieldSettings.Required | true | - | Fields[0].DateTimeFieldSettings.Editor.Date | | - | Fields[0].DateTimeFieldSettings.Editor.Time | 12:00 AM | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - Then I should see "Event.EventDate.Editor.Date" - When I fill in - | name | value | - | Event.EventDate.Editor.Date | | - | Event.EventDate.Editor.Time | | - And I hit "Save" - Then I should see "Date of the event is required." + And I should see "1/31/2016 10:00" Scenario: Creating and using date time fields in another culture diff --git a/src/Orchard.Specs/DateTime.feature.cs b/src/Orchard.Specs/DateTime.feature.cs index 00e9c93ea..120475091 100644 --- a/src/Orchard.Specs/DateTime.feature.cs +++ b/src/Orchard.Specs/DateTime.feature.cs @@ -359,139 +359,32 @@ this.ScenarioSetup(scenarioInfo); table15.AddRow(new string[] { "Fields[0].DateTimeFieldSettings.Display", "DateAndTime"}); - table15.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Required", - "false"}); table15.AddRow(new string[] { "Fields[0].DateTimeFieldSettings.Editor.Date", - "01/31/2012"}); + "01/31/2016"}); table15.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Editor.Time", - "11:00 AM"}); -#line 144 - testRunner.And("I fill in", ((string)(null)), table15, "And "); -#line 150 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 151 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 152 - testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table16.AddRow(new string[] { - "Event.EventDate.Editor.Date", - ""}); - table16.AddRow(new string[] { - "Event.EventDate.Editor.Time", - ""}); -#line 153 - testRunner.When("I fill in", ((string)(null)), table16, "When "); -#line 157 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 158 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 159 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 160 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 161 - testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 162 - testRunner.And("I should see \"1/31/2012 11:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 165 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table17.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Display", - "DateAndTime"}); - table17.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Required", - "true"}); - table17.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Editor.Date", - "01/31/2012"}); - table17.AddRow(new string[] { "Fields[0].DateTimeFieldSettings.Editor.Time", "10:00 AM"}); -#line 166 - testRunner.And("I fill in", ((string)(null)), table17, "And "); -#line 172 +#line 144 + testRunner.And("I fill in", ((string)(null)), table15, "And "); +#line 149 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 173 +#line 150 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 174 +#line 151 testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table18.AddRow(new string[] { - "Event.EventDate.Editor.Date", - ""}); - table18.AddRow(new string[] { - "Event.EventDate.Editor.Time", - ""}); -#line 175 - testRunner.When("I fill in", ((string)(null)), table18, "When "); -#line 179 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 180 +#line 152 + testRunner.When("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); +#line 153 testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 181 +#line 154 testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 182 +#line 155 testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 183 +#line 156 testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 184 - testRunner.And("I should see \"1/31/2012 10:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 187 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table19.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Display", - "DateAndTime"}); - table19.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Required", - "true"}); - table19.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Editor.Date", - ""}); - table19.AddRow(new string[] { - "Fields[0].DateTimeFieldSettings.Editor.Time", - "12:00 AM"}); -#line 188 - testRunner.And("I fill in", ((string)(null)), table19, "And "); -#line 194 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 195 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 196 - testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - TechTalk.SpecFlow.Table table20 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table20.AddRow(new string[] { - "Event.EventDate.Editor.Date", - ""}); - table20.AddRow(new string[] { - "Event.EventDate.Editor.Time", - ""}); -#line 197 - testRunner.When("I fill in", ((string)(null)), table20, "When "); -#line 201 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 202 - testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 157 + testRunner.And("I should see \"1/31/2016 10:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden this.ScenarioCleanup(); } @@ -501,119 +394,119 @@ this.ScenarioSetup(scenarioInfo); public virtual void CreatingAndUsingDateTimeFieldsInAnotherCulture() { TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Creating and using date time fields in another culture", ((string[])(null))); -#line 204 +#line 159 this.ScenarioSetup(scenarioInfo); -#line 207 +#line 162 testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line 208 +#line 163 testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 209 +#line 164 testRunner.And("I have the file \"Content\\orchard.core.po\" in \"Core\\App_Data\\Localization\\fr-FR\\or" + "chard.core.po\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 210 +#line 165 testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 211 +#line 166 testRunner.Then("I should see \"]*>.*?Create new type\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 212 +#line 167 testRunner.When("I go to \"Admin/ContentTypes/Create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden - TechTalk.SpecFlow.Table table21 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table21.AddRow(new string[] { + table16.AddRow(new string[] { "DisplayName", "Event"}); - table21.AddRow(new string[] { + table16.AddRow(new string[] { "Name", "Event"}); -#line 213 - testRunner.And("I fill in", ((string)(null)), table21, "And "); -#line 217 +#line 168 + testRunner.And("I fill in", ((string)(null)), table16, "And "); +#line 172 testRunner.And("I hit \"Create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 218 +#line 173 testRunner.And("I go to \"Admin/ContentTypes/\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 219 +#line 174 testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 222 +#line 177 testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 223 +#line 178 testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table22 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table22.AddRow(new string[] { + table17.AddRow(new string[] { "DisplayName", "Date of the event"}); - table22.AddRow(new string[] { + table17.AddRow(new string[] { "Name", "EventDate"}); - table22.AddRow(new string[] { + table17.AddRow(new string[] { "FieldTypeName", "DateTimeField"}); -#line 224 - testRunner.And("I fill in", ((string)(null)), table22, "And "); -#line 229 +#line 179 + testRunner.And("I fill in", ((string)(null)), table17, "And "); +#line 184 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 230 +#line 185 testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 231 +#line 186 testRunner.Then("I should see \"The \\\"Date of the event\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 234 +#line 189 testRunner.When("I have \"fr-FR\" as the default culture", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 235 +#line 190 testRunner.And("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table23 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table23.AddRow(new string[] { + table18.AddRow(new string[] { "Fields[0].DateTimeFieldSettings.Display", "DateAndTime"}); - table23.AddRow(new string[] { + table18.AddRow(new string[] { "Fields[0].DateTimeFieldSettings.Required", "true"}); -#line 236 - testRunner.And("I fill in", ((string)(null)), table23, "And "); -#line 240 +#line 191 + testRunner.And("I fill in", ((string)(null)), table18, "And "); +#line 195 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 241 +#line 196 testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden - TechTalk.SpecFlow.Table table24 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table24.AddRow(new string[] { + table19.AddRow(new string[] { "Event.EventDate.Editor.Date", "01/31/2012"}); - table24.AddRow(new string[] { + table19.AddRow(new string[] { "Event.EventDate.Editor.Time", "12:00 AM"}); -#line 242 - testRunner.And("I fill in", ((string)(null)), table24, "And "); -#line 246 +#line 197 + testRunner.And("I fill in", ((string)(null)), table19, "And "); +#line 201 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 247 +#line 202 testRunner.Then("I should see \"Date of the event could not be parsed as a valid date and time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 248 +#line 203 testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden - TechTalk.SpecFlow.Table table25 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table20 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table25.AddRow(new string[] { + table20.AddRow(new string[] { "Event.EventDate.Editor.Date", "31/01/2012"}); - table25.AddRow(new string[] { + table20.AddRow(new string[] { "Event.EventDate.Editor.Time", "18:00"}); -#line 249 - testRunner.And("I fill in", ((string)(null)), table25, "And "); -#line 253 +#line 204 + testRunner.And("I fill in", ((string)(null)), table20, "And "); +#line 208 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 254 +#line 209 testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 255 +#line 210 testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Specs/Enumeration.feature b/src/Orchard.Specs/Enumeration.feature index 55b5efd3e..bee7b46ec 100644 --- a/src/Orchard.Specs/Enumeration.feature +++ b/src/Orchard.Specs/Enumeration.feature @@ -108,7 +108,7 @@ Scenario: Creating and using Enumeration fields And I hit "Save" Then I should see "The field Location is mandatory." - # The default value should be used on creation + # The default value should be proposed on creation When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | @@ -118,84 +118,23 @@ Scenario: Creating and using Enumeration fields And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "selected=\"selected">Seattle" - - # If not required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].EnumerationFieldSettings.Required | false | - | Fields[0].EnumerationFieldSettings.Options | Boston | - | Fields[0].EnumerationFieldSettings.ListMode | Checkbox | - | Fields[0].EnumerationFieldSettings.DefaultValue | foo;Boston;bar | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - Then I should see "Location" - When I fill in - | name | value | - | Event.Location.SelectedValues | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Location:" - And I should see "Boston" - - # If required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].EnumerationFieldSettings.Required | true | - | Fields[0].EnumerationFieldSettings.Options | Phoenix | - | Fields[0].EnumerationFieldSettings.ListMode | Checkbox | - | Fields[0].EnumerationFieldSettings.DefaultValue | foo;Phoenix;bar | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - Then I should see "Location" - When I fill in - | name | value | - | Event.Location.SelectedValues | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Location:" - And I should see "Phoenix" - - # If required and the default value is not valid, the value should be required - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].EnumerationFieldSettings.Required | true | - | Fields[0].EnumerationFieldSettings.Options | Phoenix | - | Fields[0].EnumerationFieldSettings.ListMode | Checkbox | - | Fields[0].EnumerationFieldSettings.DefaultValue | foo;bar | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - Then I should see "Location" - When I fill in - | name | value | - | Event.Location.SelectedValues | | - And I hit "Save" - Then I should see "The field Location is mandatory." - # If required and no default value, the list box should have the required attribute + # The required attribute should be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].EnumerationFieldSettings.Required | true | | Fields[0].EnumerationFieldSettings.ListMode | Listbox | - | Fields[0].EnumerationFieldSettings.DefaultValue | | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "required=\"required\"" - # If required and a default value is set, the list box should not have the required attribute + # The required attribute should not be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | - | Fields[0].EnumerationFieldSettings.Required | true | + | Fields[0].EnumerationFieldSettings.Required | false | | Fields[0].EnumerationFieldSettings.ListMode | Listbox | - | Fields[0].EnumerationFieldSettings.DefaultValue | Phoenix | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should not see "required=\"required\"" diff --git a/src/Orchard.Specs/Enumeration.feature.cs b/src/Orchard.Specs/Enumeration.feature.cs index 5d8e0495d..6f62ed7f9 100644 --- a/src/Orchard.Specs/Enumeration.feature.cs +++ b/src/Orchard.Specs/Enumeration.feature.cs @@ -304,176 +304,37 @@ this.ScenarioSetup(scenarioInfo); "value"}); table12.AddRow(new string[] { "Fields[0].EnumerationFieldSettings.Required", - "false"}); - table12.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Options", - "Boston"}); + "true"}); table12.AddRow(new string[] { "Fields[0].EnumerationFieldSettings.ListMode", - "Checkbox"}); - table12.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.DefaultValue", - "foo;Boston;bar"}); + "Listbox"}); #line 124 testRunner.And("I fill in", ((string)(null)), table12, "And "); -#line 130 +#line 128 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 131 +#line 129 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 132 - testRunner.Then("I should see \"Location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 130 + testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 133 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table13.AddRow(new string[] { - "Event.Location.SelectedValues", - ""}); -#line 133 - testRunner.When("I fill in", ((string)(null)), table13, "When "); -#line 136 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 137 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + "Fields[0].EnumerationFieldSettings.Required", + "false"}); + table13.AddRow(new string[] { + "Fields[0].EnumerationFieldSettings.ListMode", + "Listbox"}); +#line 134 + testRunner.And("I fill in", ((string)(null)), table13, "And "); #line 138 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 139 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 140 - testRunner.Then("I should see \"Location:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 141 - testRunner.And("I should see \"Boston\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 144 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table14.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Required", - "true"}); - table14.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Options", - "Phoenix"}); - table14.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.ListMode", - "Checkbox"}); - table14.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.DefaultValue", - "foo;Phoenix;bar"}); -#line 145 - testRunner.And("I fill in", ((string)(null)), table14, "And "); -#line 151 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 152 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 153 - testRunner.Then("I should see \"Location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table15.AddRow(new string[] { - "Event.Location.SelectedValues", - ""}); -#line 154 - testRunner.When("I fill in", ((string)(null)), table15, "When "); -#line 157 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 158 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 159 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 160 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 161 - testRunner.Then("I should see \"Location:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 162 - testRunner.And("I should see \"Phoenix\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 165 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table16.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Required", - "true"}); - table16.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Options", - "Phoenix"}); - table16.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.ListMode", - "Checkbox"}); - table16.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.DefaultValue", - "foo;bar"}); -#line 166 - testRunner.And("I fill in", ((string)(null)), table16, "And "); -#line 172 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 173 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 174 - testRunner.Then("I should see \"Location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table17.AddRow(new string[] { - "Event.Location.SelectedValues", - ""}); -#line 175 - testRunner.When("I fill in", ((string)(null)), table17, "When "); -#line 178 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 179 - testRunner.Then("I should see \"The field Location is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 182 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table18.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Required", - "true"}); - table18.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.ListMode", - "Listbox"}); - table18.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.DefaultValue", - ""}); -#line 183 - testRunner.And("I fill in", ((string)(null)), table18, "And "); -#line 188 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 189 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 190 - testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 193 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table19.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.Required", - "true"}); - table19.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.ListMode", - "Listbox"}); - table19.AddRow(new string[] { - "Fields[0].EnumerationFieldSettings.DefaultValue", - "Phoenix"}); -#line 194 - testRunner.And("I fill in", ((string)(null)), table19, "And "); -#line 199 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 200 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 201 testRunner.Then("I should not see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Specs/Input.feature b/src/Orchard.Specs/Input.feature index 54af4f43a..2db7cb2c2 100644 --- a/src/Orchard.Specs/Input.feature +++ b/src/Orchard.Specs/Input.feature @@ -129,58 +129,29 @@ Scenario: Creating and using Input fields Then I should see "Contact:" And I should see "contact@orchardproject.net" - # If not required and no value, the default value should be used + # The default value should be proposed on creation When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | - | Fields[0].InputFieldSettings.Required | false | - | Fields[0].InputFieldSettings.DefaultValue | contact1@orchardproject.net | + | Fields[0].InputFieldSettings.DefaultValue | contact@orchardproject.net | And I hit "Save" And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Contact.Value | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Contact:" - And I should see "contact1@orchardproject.net" + Then I should see "value=\"contact@orchardproject.net\"" - # If required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].InputFieldSettings.Required | true | - | Fields[0].InputFieldSettings.DefaultValue | contact2@orchardproject.net | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Contact.Value | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Contact:" - And I should see "contact2@orchardproject.net" - - # If required and no default value, the required attribute should be used + # The required attribute should be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].InputFieldSettings.Required | true | - | Fields[0].InputFieldSettings.DefaultValue | | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "required=\"required\"" - # If required and a default value is set, the required attribute should not be used + # The required attribute should not be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in - | name | value | - | Fields[0].InputFieldSettings.Required | true | - | Fields[0].InputFieldSettings.DefaultValue | contact@orchardproject.net | + | name | value | + | Fields[0].InputFieldSettings.Required | false | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should not see "required=\"required\"" \ No newline at end of file diff --git a/src/Orchard.Specs/Input.feature.cs b/src/Orchard.Specs/Input.feature.cs index 0f7c48698..7d3df6de0 100644 --- a/src/Orchard.Specs/Input.feature.cs +++ b/src/Orchard.Specs/Input.feature.cs @@ -303,39 +303,34 @@ this.ScenarioSetup(scenarioInfo); TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table13.AddRow(new string[] { - "Fields[0].InputFieldSettings.Required", - "false"}); table13.AddRow(new string[] { "Fields[0].InputFieldSettings.DefaultValue", - "contact1@orchardproject.net"}); + "contact@orchardproject.net"}); #line 134 testRunner.And("I fill in", ((string)(null)), table13, "And "); -#line 138 +#line 137 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 139 +#line 138 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 139 + testRunner.Then("I should see \"value=\\\"contact@orchardproject.net\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 142 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table14.AddRow(new string[] { - "Event.Contact.Value", - ""}); -#line 140 - testRunner.And("I fill in", ((string)(null)), table14, "And "); + "Fields[0].InputFieldSettings.Required", + "true"}); #line 143 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 144 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 145 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.And("I fill in", ((string)(null)), table14, "And "); #line 146 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 147 - testRunner.Then("I should see \"Contact:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 148 - testRunner.And("I should see \"contact1@orchardproject.net\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line 151 testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden @@ -344,76 +339,14 @@ this.ScenarioSetup(scenarioInfo); "value"}); table15.AddRow(new string[] { "Fields[0].InputFieldSettings.Required", - "true"}); - table15.AddRow(new string[] { - "Fields[0].InputFieldSettings.DefaultValue", - "contact2@orchardproject.net"}); + "false"}); #line 152 testRunner.And("I fill in", ((string)(null)), table15, "And "); +#line 155 + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 156 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 157 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table16.AddRow(new string[] { - "Event.Contact.Value", - ""}); -#line 158 - testRunner.And("I fill in", ((string)(null)), table16, "And "); -#line 161 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 162 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 163 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 164 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 165 - testRunner.Then("I should see \"Contact:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 166 - testRunner.And("I should see \"contact2@orchardproject.net\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 169 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table17.AddRow(new string[] { - "Fields[0].InputFieldSettings.Required", - "true"}); - table17.AddRow(new string[] { - "Fields[0].InputFieldSettings.DefaultValue", - ""}); -#line 170 - testRunner.And("I fill in", ((string)(null)), table17, "And "); -#line 174 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 175 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 176 - testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 179 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table18.AddRow(new string[] { - "Fields[0].InputFieldSettings.Required", - "true"}); - table18.AddRow(new string[] { - "Fields[0].InputFieldSettings.DefaultValue", - "contact@orchardproject.net"}); -#line 180 - testRunner.And("I fill in", ((string)(null)), table18, "And "); -#line 184 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 185 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 186 testRunner.Then("I should not see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Specs/Link.feature b/src/Orchard.Specs/Link.feature index d190a6f27..2916a0a05 100644 --- a/src/Orchard.Specs/Link.feature +++ b/src/Orchard.Specs/Link.feature @@ -69,64 +69,29 @@ Scenario: Creating and using Link fields And I hit "Save" Then I should see "Url is required for Site Url." - # If not required and no value, the default value should be used + # The default value should be proposed on creation When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | - | Fields[0].LinkFieldSettings.Required | false | | Fields[0].LinkFieldSettings.DefaultValue | http://www.orchardproject.net | And I hit "Save" And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.SiteUrl.Value | | - And I fill in - | name | value | - | Event.SiteUrl.Text | Orchard1 | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Site Url:" - And I should see "Orchard1" + Then I should see "value=\"http://www.orchardproject.net\"" - # If required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].LinkFieldSettings.Required | true | - | Fields[0].LinkFieldSettings.DefaultValue | http://www.orchardproject.net | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.SiteUrl.Value | | - And I fill in - | name | value | - | Event.SiteUrl.Text | Orchard2 | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Site Url:" - And I should see "Orchard2" - - # If required and no default value, the required attribute should be used + # The required attribute should be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].LinkFieldSettings.Required | true | - | Fields[0].LinkFieldSettings.DefaultValue | | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "required=\"required\"" - # If required and a default value is set, the required attribute should not be used + # The required attribute should not be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in - | name | value | - | Fields[0].LinkFieldSettings.Required | true | - | Fields[0].LinkFieldSettings.DefaultValue | http://www.orchardproject.net | + | name | value | + | Fields[0].LinkFieldSettings.Required | false | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should not see "required=\"required\"" \ No newline at end of file diff --git a/src/Orchard.Specs/Link.feature.cs b/src/Orchard.Specs/Link.feature.cs index 28570e144..6f3b58a63 100644 --- a/src/Orchard.Specs/Link.feature.cs +++ b/src/Orchard.Specs/Link.feature.cs @@ -210,135 +210,50 @@ this.ScenarioSetup(scenarioInfo); TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table8.AddRow(new string[] { - "Fields[0].LinkFieldSettings.Required", - "false"}); table8.AddRow(new string[] { "Fields[0].LinkFieldSettings.DefaultValue", "http://www.orchardproject.net"}); #line 74 testRunner.And("I fill in", ((string)(null)), table8, "And "); -#line 78 +#line 77 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 79 +#line 78 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 79 + testRunner.Then("I should see \"value=\\\"http://www.orchardproject.net\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 82 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table9.AddRow(new string[] { - "Event.SiteUrl.Value", - ""}); -#line 80 + "Fields[0].LinkFieldSettings.Required", + "true"}); +#line 83 testRunner.And("I fill in", ((string)(null)), table9, "And "); +#line 86 + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 87 + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 88 + testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 91 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table10.AddRow(new string[] { - "Event.SiteUrl.Text", - "Orchard1"}); -#line 83 + "Fields[0].LinkFieldSettings.Required", + "false"}); +#line 92 testRunner.And("I fill in", ((string)(null)), table10, "And "); -#line 86 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 87 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 88 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 89 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 90 - testRunner.Then("I should see \"Site Url:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 91 - testRunner.And("I should see \"Orchard1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 94 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table11.AddRow(new string[] { - "Fields[0].LinkFieldSettings.Required", - "true"}); - table11.AddRow(new string[] { - "Fields[0].LinkFieldSettings.DefaultValue", - "http://www.orchardproject.net"}); #line 95 - testRunner.And("I fill in", ((string)(null)), table11, "And "); -#line 99 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 100 +#line 96 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table12.AddRow(new string[] { - "Event.SiteUrl.Value", - ""}); -#line 101 - testRunner.And("I fill in", ((string)(null)), table12, "And "); -#line hidden - TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table13.AddRow(new string[] { - "Event.SiteUrl.Text", - "Orchard2"}); -#line 104 - testRunner.And("I fill in", ((string)(null)), table13, "And "); -#line 107 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 108 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 109 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 110 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 111 - testRunner.Then("I should see \"Site Url:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 112 - testRunner.And("I should see \"Orchard2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 115 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table14.AddRow(new string[] { - "Fields[0].LinkFieldSettings.Required", - "true"}); - table14.AddRow(new string[] { - "Fields[0].LinkFieldSettings.DefaultValue", - ""}); -#line 116 - testRunner.And("I fill in", ((string)(null)), table14, "And "); -#line 120 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 121 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 122 - testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 125 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table15.AddRow(new string[] { - "Fields[0].LinkFieldSettings.Required", - "true"}); - table15.AddRow(new string[] { - "Fields[0].LinkFieldSettings.DefaultValue", - "http://www.orchardproject.net"}); -#line 126 - testRunner.And("I fill in", ((string)(null)), table15, "And "); -#line 130 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 131 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 132 +#line 97 testRunner.Then("I should not see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Specs/Numeric.feature b/src/Orchard.Specs/Numeric.feature index 05f87e8f5..4e76bfd2f 100644 --- a/src/Orchard.Specs/Numeric.feature +++ b/src/Orchard.Specs/Numeric.feature @@ -99,101 +99,36 @@ Scenario: Creating and using numeric fields And I should see "The value 'b' is not valid for Maximum." # The value should be validated - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].NumericFieldSettings.Required | false | - | Fields[0].NumericFieldSettings.DefaultValue | 4 | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" + When I go to "Admin/Contents/Create/Event" And I fill in | name | value | | Event.Guests.Value | a | And I hit "Save" - Then I should see "Guests or its default value is an invalid number" + Then I should see "Guests is an invalid number" - # If not required and no value, the default value should be used + # The default value should be proposed on creation When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | - | Fields[0].NumericFieldSettings.Required | false | - | Fields[0].NumericFieldSettings.DefaultValue | 4 | + | Fields[0].NumericFieldSettings.DefaultValue | 1234 | And I hit "Save" And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Guests.Value | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Guests:" - And I should see "4" + Then I should see "value=\"1234\"" - # If required and no value, the default value should be used + # The required attribute should be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].NumericFieldSettings.Required | true | - | Fields[0].NumericFieldSettings.DefaultValue | 5 | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Guests.Value | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - When I go to "Admin/Contents/List" - Then I should see "Guests:" - And I should see "5" - - # The default value should be validated - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].NumericFieldSettings.Required | false | - | Fields[0].NumericFieldSettings.DefaultValue | a | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Guests.Value | | - And I hit "Save" - Then I should see "Guests or its default value is an invalid number" - - # The default value should be bound - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].NumericFieldSettings.Required | false | - | Fields[0].NumericFieldSettings.Minimum | -10 | - | Fields[0].NumericFieldSettings.Maximum | 100 | - | Fields[0].NumericFieldSettings.DefaultValue | -20 | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Guests.Value | | - And I hit "Save" - Then I should see "The value must be greater than -10" - - # If required and no default value, the required attribute should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].NumericFieldSettings.Required | true | - | Fields[0].NumericFieldSettings.DefaultValue | | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "required=\"required\"" - # If required and a default value is set, the required attribute should not be used + # The required attribute should not be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | - | Fields[0].NumericFieldSettings.Required | true | - | Fields[0].NumericFieldSettings.DefaultValue | 6 | + | Fields[0].NumericFieldSettings.Required | false | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should not see "required=\"required\"" \ No newline at end of file diff --git a/src/Orchard.Specs/Numeric.feature.cs b/src/Orchard.Specs/Numeric.feature.cs index ba4bda9ce..4b7744a44 100644 --- a/src/Orchard.Specs/Numeric.feature.cs +++ b/src/Orchard.Specs/Numeric.feature.cs @@ -266,37 +266,38 @@ this.ScenarioSetup(scenarioInfo); #line 99 testRunner.And("I should see \"The value 'b' is not valid for Maximum.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 102 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table11.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Required", - "false"}); - table11.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - "4"}); + "Event.Guests.Value", + "a"}); #line 103 testRunner.And("I fill in", ((string)(null)), table11, "And "); -#line 107 +#line 106 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 108 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 107 + testRunner.Then("I should see \"Guests is an invalid number\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 110 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table12.AddRow(new string[] { - "Event.Guests.Value", - "a"}); -#line 109 + "Fields[0].NumericFieldSettings.DefaultValue", + "1234"}); +#line 111 testRunner.And("I fill in", ((string)(null)), table12, "And "); -#line 112 +#line 114 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 113 - testRunner.Then("I should see \"Guests or its default value is an invalid number\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 115 + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 116 + testRunner.Then("I should see \"value=\\\"1234\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 119 testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { @@ -304,183 +305,31 @@ this.ScenarioSetup(scenarioInfo); "value"}); table13.AddRow(new string[] { "Fields[0].NumericFieldSettings.Required", - "false"}); - table13.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - "4"}); -#line 117 + "true"}); +#line 120 testRunner.And("I fill in", ((string)(null)), table13, "And "); -#line 121 +#line 123 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 122 +#line 124 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 125 + testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 128 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table14.AddRow(new string[] { - "Event.Guests.Value", - ""}); -#line 123 - testRunner.And("I fill in", ((string)(null)), table14, "And "); -#line 126 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 127 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 128 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + "Fields[0].NumericFieldSettings.Required", + "false"}); #line 129 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 130 - testRunner.Then("I should see \"Guests:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 131 - testRunner.And("I should see \"4\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I fill in", ((string)(null)), table14, "And "); +#line 132 + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 133 + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 134 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table15.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Required", - "true"}); - table15.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - "5"}); -#line 135 - testRunner.And("I fill in", ((string)(null)), table15, "And "); -#line 139 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 140 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table16.AddRow(new string[] { - "Event.Guests.Value", - ""}); -#line 141 - testRunner.And("I fill in", ((string)(null)), table16, "And "); -#line 144 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 145 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 146 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 147 - testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 148 - testRunner.Then("I should see \"Guests:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 149 - testRunner.And("I should see \"5\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 152 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table17.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Required", - "false"}); - table17.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - "a"}); -#line 153 - testRunner.And("I fill in", ((string)(null)), table17, "And "); -#line 157 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 158 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table18.AddRow(new string[] { - "Event.Guests.Value", - ""}); -#line 159 - testRunner.And("I fill in", ((string)(null)), table18, "And "); -#line 162 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 163 - testRunner.Then("I should see \"Guests or its default value is an invalid number\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 166 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table19.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Required", - "false"}); - table19.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Minimum", - "-10"}); - table19.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Maximum", - "100"}); - table19.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - "-20"}); -#line 167 - testRunner.And("I fill in", ((string)(null)), table19, "And "); -#line 173 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 174 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table20 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table20.AddRow(new string[] { - "Event.Guests.Value", - ""}); -#line 175 - testRunner.And("I fill in", ((string)(null)), table20, "And "); -#line 178 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 179 - testRunner.Then("I should see \"The value must be greater than -10\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 182 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table21 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table21.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Required", - "true"}); - table21.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - ""}); -#line 183 - testRunner.And("I fill in", ((string)(null)), table21, "And "); -#line 187 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 188 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 189 - testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 192 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table22 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table22.AddRow(new string[] { - "Fields[0].NumericFieldSettings.Required", - "true"}); - table22.AddRow(new string[] { - "Fields[0].NumericFieldSettings.DefaultValue", - "6"}); -#line 193 - testRunner.And("I fill in", ((string)(null)), table22, "And "); -#line 197 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 198 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 199 testRunner.Then("I should not see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Specs/Properties/AssemblyInfo.cs b/src/Orchard.Specs/Properties/AssemblyInfo.cs index 16d72e0d4..93ca9db20 100644 --- a/src/Orchard.Specs/Properties/AssemblyInfo.cs +++ b/src/Orchard.Specs/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Specs/Text.feature b/src/Orchard.Specs/Text.feature index 3ddeaee99..0be4fc693 100644 --- a/src/Orchard.Specs/Text.feature +++ b/src/Orchard.Specs/Text.feature @@ -67,60 +67,35 @@ Scenario: Creating and using Text fields Then I should see "Subject" When I fill in | name | value | - | Event.Subject.Text | Orchard Harvest 2013 | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - And I should see "Orchard Harvest 2013" - - # If not required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.Required | false | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue | Orchard Harvest 2014 | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Subject.Text | | - And I hit "Save" - And I am redirected - Then I should see "Your Event has been created." - And I should see "Orchard Harvest 2014" - - # If required and no value, the default value should be used - When I go to "Admin/ContentTypes/Edit/Event" - And I fill in - | name | value | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.Required | true | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue | Orchard Harvest 2015 | - And I hit "Save" - And I go to "Admin/Contents/Create/Event" - And I fill in - | name | value | - | Event.Subject.Text | | + | Event.Subject.Text | Orchard Harvest 2015 | And I hit "Save" And I am redirected Then I should see "Your Event has been created." And I should see "Orchard Harvest 2015" - # If required and no default value, the required attribute should be used + # The default value should be proposed on creation + When I go to "Admin/ContentTypes/Edit/Event" + And I fill in + | name | value | + | Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue | Orchard Harvest 2016 | + And I hit "Save" + And I go to "Admin/Contents/Create/Event" + Then I should see "value=\"Orchard Harvest 2016\"" + + # The required attribute should be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[0].TextFieldSettingsEventsViewModel.Settings.Required | true | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue | | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should see "required=\"required\"" - # If required and a default value is set, the required attribute should not be used + # The required attribute should not be used When I go to "Admin/ContentTypes/Edit/Event" And I fill in - | name | value | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.Required | true | - | Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue | Orchard Harvest 2015 | + | name | value | + | Fields[0].TextFieldSettingsEventsViewModel.Settings.Required | false | And I hit "Save" And I go to "Admin/Contents/Create/Event" Then I should not see "required=\"required\"" \ No newline at end of file diff --git a/src/Orchard.Specs/Text.feature.cs b/src/Orchard.Specs/Text.feature.cs index bb37125eb..922a28491 100644 --- a/src/Orchard.Specs/Text.feature.cs +++ b/src/Orchard.Specs/Text.feature.cs @@ -197,7 +197,7 @@ this.ScenarioSetup(scenarioInfo); "value"}); table7.AddRow(new string[] { "Event.Subject.Text", - "Orchard Harvest 2013"}); + "Orchard Harvest 2015"}); #line 68 testRunner.When("I fill in", ((string)(null)), table7, "When "); #line 71 @@ -207,43 +207,42 @@ this.ScenarioSetup(scenarioInfo); #line 73 testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line 74 - testRunner.And("I should see \"Orchard Harvest 2013\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I should see \"Orchard Harvest 2015\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 77 testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); - table8.AddRow(new string[] { - "Fields[0].TextFieldSettingsEventsViewModel.Settings.Required", - "false"}); table8.AddRow(new string[] { "Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue", - "Orchard Harvest 2014"}); + "Orchard Harvest 2016"}); #line 78 testRunner.And("I fill in", ((string)(null)), table8, "And "); -#line 82 +#line 81 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 83 +#line 82 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 83 + testRunner.Then("I should see \"value=\\\"Orchard Harvest 2016\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 86 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] { "name", "value"}); table9.AddRow(new string[] { - "Event.Subject.Text", - ""}); -#line 84 - testRunner.And("I fill in", ((string)(null)), table9, "And "); + "Fields[0].TextFieldSettingsEventsViewModel.Settings.Required", + "true"}); #line 87 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 88 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 89 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.And("I fill in", ((string)(null)), table9, "And "); #line 90 - testRunner.And("I should see \"Orchard Harvest 2014\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 93 + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 91 + testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 92 + testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 95 testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] { @@ -251,72 +250,14 @@ this.ScenarioSetup(scenarioInfo); "value"}); table10.AddRow(new string[] { "Fields[0].TextFieldSettingsEventsViewModel.Settings.Required", - "true"}); - table10.AddRow(new string[] { - "Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue", - "Orchard Harvest 2015"}); -#line 94 + "false"}); +#line 96 testRunner.And("I fill in", ((string)(null)), table10, "And "); -#line 98 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 99 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table11.AddRow(new string[] { - "Event.Subject.Text", - ""}); + testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 100 - testRunner.And("I fill in", ((string)(null)), table11, "And "); -#line 103 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 104 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 105 - testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 106 - testRunner.And("I should see \"Orchard Harvest 2015\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 109 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table12.AddRow(new string[] { - "Fields[0].TextFieldSettingsEventsViewModel.Settings.Required", - "true"}); - table12.AddRow(new string[] { - "Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue", - ""}); -#line 110 - testRunner.And("I fill in", ((string)(null)), table12, "And "); -#line 114 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 115 testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 116 - testRunner.Then("I should see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 119 - testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table13.AddRow(new string[] { - "Fields[0].TextFieldSettingsEventsViewModel.Settings.Required", - "true"}); - table13.AddRow(new string[] { - "Fields[0].TextFieldSettingsEventsViewModel.Settings.DefaultValue", - "Orchard Harvest 2015"}); -#line 120 - testRunner.And("I fill in", ((string)(null)), table13, "And "); -#line 124 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 125 - testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 126 +#line 101 testRunner.Then("I should not see \"required=\\\"required\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs index a8924a7a7..942c0ba17 100644 --- a/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs +++ b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Tests/Properties/AssemblyInfo.cs index 02b2f097a..dc92960f1 100644 --- a/src/Orchard.Tests/Properties/AssemblyInfo.cs +++ b/src/Orchard.Tests/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs b/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs index 409508a24..83166cb9b 100644 --- a/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs +++ b/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs @@ -32,8 +32,8 @@ using System.Security; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] // Enable web application to call this assembly in Full Trust [assembly: AllowPartiallyTrustedCallers] diff --git a/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs index 266bef2ae..203fbfe61 100644 --- a/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs index 24b455019..8b8b92abc 100644 --- a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs +++ b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs @@ -45,10 +45,13 @@ namespace Orchard.Core.Common.Drivers { protected override DriverResult Editor(ContentPart part, TextField field, dynamic shapeHelper) { return ContentShape("Fields_Common_Text_Edit", GetDifferentiator(field, part), () => { + var settings = field.PartFieldDefinition.Settings.GetModel(); + var text = part.IsNew() ? settings.DefaultValue : field.Value; + var viewModel = new TextFieldDriverViewModel { Field = field, - Text = field.Value, - Settings = field.PartFieldDefinition.Settings.GetModel(), + Text = text, + Settings = settings, ContentItem = part.ContentItem }; @@ -65,10 +68,6 @@ namespace Orchard.Core.Common.Drivers { field.Value = viewModel.Text; - if (String.IsNullOrWhiteSpace(field.Value) && !String.IsNullOrWhiteSpace(settings.DefaultValue)) { - field.Value = settings.DefaultValue; - } - if (settings.Required && String.IsNullOrWhiteSpace(field.Value)) { updater.AddModelError("Text", T("The field {0} is mandatory", T(field.DisplayName))); } diff --git a/src/Orchard.Web/Core/Common/Module.txt b/src/Orchard.Web/Core/Common/Module.txt index c22491d28..c2ed93b80 100644 --- a/src/Orchard.Web/Core/Common/Module.txt +++ b/src/Orchard.Web/Core/Common/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The common module introduces content parts that are going to be used by most content types (common, body, identity). FeatureDescription: Core content parts. diff --git a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml index bbd84d350..01bdbffde 100644 --- a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml @@ -1,8 +1,6 @@ @model Orchard.Core.Common.ViewModels.TextFieldSettingsEventsViewModel -@* This is a token-less default value editor that can be overridden from features that can depend on Orchard.Tokens. *@ - @Html.TextBoxFor(m => m.Settings.DefaultValue, new { @class = "text large" }) -@T("Default value for the field. If there is no value given for the actual field, this will be filled in. (optional)") +@T("The default value proposed when creating a content item. (optional)") @Html.ValidationMessageFor(m => m.Settings.DefaultValue) \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml index 600a651d6..b91ef2c63 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml @@ -1,7 +1,5 @@ @model Orchard.Core.Common.ViewModels.TextFieldDriverViewModel -@{ - var isRequired = Model.Settings.Required && String.IsNullOrWhiteSpace(Model.Settings.DefaultValue); -} +
@if (String.IsNullOrWhiteSpace(Model.Settings.Flavor)) { @@ -16,7 +14,4 @@ @if (HasText(Model.Settings.Hint)) { @Model.Settings.Hint } - @if (!String.IsNullOrWhiteSpace(Model.Settings.DefaultValue)) { - @T("If the field is left empty then the default value will be used.") - }
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Containers/Module.txt b/src/Orchard.Web/Core/Containers/Module.txt index 123205ff2..5dd850798 100644 --- a/src/Orchard.Web/Core/Containers/Module.txt +++ b/src/Orchard.Web/Core/Containers/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The containers module introduces container and containable behaviors for content items. FeatureDescription: Container and containable parts to enable parent-child relationships between content items. diff --git a/src/Orchard.Web/Core/Contents/Module.txt b/src/Orchard.Web/Core/Contents/Module.txt index ae1fd1e0d..be6ee8d81 100644 --- a/src/Orchard.Web/Core/Contents/Module.txt +++ b/src/Orchard.Web/Core/Contents/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The contents module enables the creation of custom content types. Features: diff --git a/src/Orchard.Web/Core/Dashboard/Module.txt b/src/Orchard.Web/Core/Dashboard/Module.txt index 00c98816f..2af44b6bb 100644 --- a/src/Orchard.Web/Core/Dashboard/Module.txt +++ b/src/Orchard.Web/Core/Dashboard/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application. FeatureDescription: Standard admin dashboard. diff --git a/src/Orchard.Web/Core/Feeds/Module.txt b/src/Orchard.Web/Core/Feeds/Module.txt index 65940b478..864977bad 100644 --- a/src/Orchard.Web/Core/Feeds/Module.txt +++ b/src/Orchard.Web/Core/Feeds/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Feeds module is providing RSS feeds to content items. FeatureDescription: RSS feeds for content items. diff --git a/src/Orchard.Web/Core/Navigation/Module.txt b/src/Orchard.Web/Core/Navigation/Module.txt index 080349f40..af528f625 100644 --- a/src/Orchard.Web/Core/Navigation/Module.txt +++ b/src/Orchard.Web/Core/Navigation/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The navigation module creates and manages a simple navigation menu for the front-end of the application and allows you to add content items to the admin menu. FeatureDescription: Menu management. diff --git a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs index 3fc2fad1c..a5f74e88b 100644 --- a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Core/Reports/Module.txt b/src/Orchard.Web/Core/Reports/Module.txt index 0ecd0ca4e..7b9a61a21 100644 --- a/src/Orchard.Web/Core/Reports/Module.txt +++ b/src/Orchard.Web/Core/Reports/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The dashboard module is providing the reports screen of the application. FeatureDescription: Reports management. diff --git a/src/Orchard.Web/Core/Scheduling/Module.txt b/src/Orchard.Web/Core/Scheduling/Module.txt index 29c407af7..8ffc09edf 100644 --- a/src/Orchard.Web/Core/Scheduling/Module.txt +++ b/src/Orchard.Web/Core/Scheduling/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The scheduling module enables background task scheduling. FeatureDescription: Scheduled background tasks. diff --git a/src/Orchard.Web/Core/Settings/Module.txt b/src/Orchard.Web/Core/Settings/Module.txt index 335b6d45c..e02610c88 100644 --- a/src/Orchard.Web/Core/Settings/Module.txt +++ b/src/Orchard.Web/Core/Settings/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The settings module creates site settings that other modules can contribute to. FeatureDescription: Site settings. diff --git a/src/Orchard.Web/Core/Shapes/Module.txt b/src/Orchard.Web/Core/Shapes/Module.txt index 916048395..5254bf843 100644 --- a/src/Orchard.Web/Core/Shapes/Module.txt +++ b/src/Orchard.Web/Core/Shapes/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The shapes module contains core shape templates and display hooks. FeatureDescription: Core shape templates and display hooks. diff --git a/src/Orchard.Web/Core/Title/Module.txt b/src/Orchard.Web/Core/Title/Module.txt index d2817ffb3..7460786cf 100644 --- a/src/Orchard.Web/Core/Title/Module.txt +++ b/src/Orchard.Web/Core/Title/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The title module enables content items to have titles. FeatureDescription: Title content part. diff --git a/src/Orchard.Web/Core/XmlRpc/Module.txt b/src/Orchard.Web/Core/XmlRpc/Module.txt index 7ead9857d..79849d971 100644 --- a/src/Orchard.Web/Core/XmlRpc/Module.txt +++ b/src/Orchard.Web/Core/XmlRpc/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter. FeatureDescription: XML-RPC opt-in implementation. diff --git a/src/Orchard.Web/Modules/Lucene/Module.txt b/src/Orchard.Web/Modules/Lucene/Module.txt index f6788e527..c6ab9b0b4 100644 --- a/src/Orchard.Web/Modules/Lucene/Module.txt +++ b/src/Orchard.Web/Modules/Lucene/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Lucene module enables the site to be indexed using Lucene.NET. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site. FeatureDescription: Lucene indexing services. diff --git a/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs index fa1a87479..a768a6035 100644 --- a/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Markdown/Module.txt b/src/Orchard.Web/Modules/Markdown/Module.txt index 7c87c4b11..d30066988 100644 --- a/src/Orchard.Web/Modules/Markdown/Module.txt +++ b/src/Orchard.Web/Modules/Markdown/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Markdown module enables rich text contents to be created using the Markdown syntax. FeatureDescription: Markdown editor. diff --git a/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs index 4d1397b67..8198dc111 100644 --- a/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs @@ -26,6 +26,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Module.txt b/src/Orchard.Web/Modules/Orchard.Alias/Module.txt index 18be44593..3e91ce806 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Alias/Module.txt @@ -2,7 +2,7 @@ Name: Alias AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Maps friendly urls to specific module actions. FeatureDescription: Maps friendly urls to specific module actions. diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs index a5f749ed4..f0cc54271 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt b/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt index 047d98737..8e7dc25a2 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt @@ -2,7 +2,7 @@ Name: AntiSpam AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides anti-spam services to protect your content from malicious submissions. Features: diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs index a230f73b8..2e5c0e6cc 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs @@ -29,6 +29,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt index e91fbab8c..e65c2eb14 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt @@ -3,7 +3,7 @@ Path: ArchiveLater AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The ArchiveLater module introduces scheduled archiving functionality. FeatureDescription: Scheduled archiving. diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs index 2d6d6067b..9e2a2fdc7 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt b/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt index 177861dd8..7a897560f 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a log for recording and viewing back-end changes. Features: diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index 131b83f67..e5c0173b4 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -135,7 +135,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Properties/AssemblyInfo.cs index 0e187682b..fdf18925d 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt b/src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt index 9a8bceb8d..cd073b38e 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt @@ -2,7 +2,7 @@ Name: Autoroute AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Description for the module Features: diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs index f7dd7c436..c8e79d52a 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt index aad365bb4..581f7265c 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: Microsoft Open Technologies, Inc Website: http://msopentech.com -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides integration of Microsoft Azure Media Services functionality into Orchard. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index ae43db858..520eff940 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -276,7 +276,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs index d290a4c70..074fbef69 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Module.txt b/src/Orchard.Web/Modules/Orchard.Azure/Module.txt index 6da671abd..deefb6ec4 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Azure/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a set of Orchard service implementations targeting Microsoft Azure services. Category: Hosting diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs index 5b30a328b..ea8efe11c 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt index 0d25339c4..9032044e6 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Orchard Blogs module is implementing basic blogging features. FeatureDescription: A simple web log. diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs index 31a22e9e6..ca21df01a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs @@ -29,6 +29,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Module.txt b/src/Orchard.Web/Modules/Orchard.Caching/Module.txt index 34aca464c..de0050dcb 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Caching/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: Sébastien Ros Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides an API to cache business data. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj index f6ed91401..5ce025dc4 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj +++ b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj @@ -90,7 +90,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs index 5996c63c3..86bf76f8b 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt index 9496e115e..e493ab9bd 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt index 12138960a..e26dd842d 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt @@ -69,7 +69,9 @@ - $$FileIncludes$$ + $$CompileIncludes$$ + $$ContentIncludes$$ + $$OrchardReferences$$ diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Theme.png b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Theme.png index 81709592e..e68bb85fa 100644 Binary files a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Theme.png and b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Theme.png differ diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs index f4fe318d8..0be4e98ab 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs @@ -273,6 +273,7 @@ namespace Orchard.CodeGeneration.Commands { string propertiesPath = modulePath + "Properties"; var content = new HashSet(); var folders = new HashSet(); + var compile = new HashSet(); foreach (var folder in _moduleDirectories) { Directory.CreateDirectory(modulePath + folder); @@ -297,27 +298,29 @@ namespace Orchard.CodeGeneration.Commands { File.WriteAllText(modulePath + "Styles\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt")); content.Add(modulePath + "Styles\\Web.config"); - string templateText = File.ReadAllText(_codeGenTemplatePath + "ModuleAssemblyInfo.txt"); - templateText = templateText.Replace("$$ModuleName$$", moduleName); - templateText = templateText.Replace("$$ModuleTypeLibGuid$$", Guid.NewGuid().ToString()); - File.WriteAllText(propertiesPath + "\\AssemblyInfo.cs", templateText); - content.Add(propertiesPath + "\\AssemblyInfo.cs"); - - templateText = File.ReadAllText(_codeGenTemplatePath + "ModuleManifest.txt"); + string templateText = File.ReadAllText(_codeGenTemplatePath + "ModuleManifest.txt"); templateText = templateText.Replace("$$ModuleName$$", moduleName); File.WriteAllText(modulePath + "Module.txt", templateText, System.Text.Encoding.UTF8); content.Add(modulePath + "Module.txt"); - var itemGroup = CreateProjectItemGroup(modulePath, content, folders); + templateText = File.ReadAllText(_codeGenTemplatePath + "ModuleAssemblyInfo.txt"); + templateText = templateText.Replace("$$ModuleName$$", moduleName); + templateText = templateText.Replace("$$ModuleTypeLibGuid$$", Guid.NewGuid().ToString()); + File.WriteAllText(propertiesPath + "\\AssemblyInfo.cs", templateText); + compile.Add(propertiesPath + "\\AssemblyInfo.cs"); - File.WriteAllText(modulePath + moduleName + ".csproj", CreateCsProject(moduleName, projectGuid, itemGroup)); + var contentItemGroup = CreateProjectItemGroup(modulePath, content, folders); + var compileItemGroup = CreateCompileItemGroup(modulePath, compile); + + File.WriteAllText(modulePath + moduleName + ".csproj", CreateCsProject(moduleName, projectGuid, contentItemGroup, compileItemGroup)); } - private static string CreateCsProject(string projectName, string projectGuid, string itemGroup) { + private static string CreateCsProject(string projectName, string projectGuid, string contentItemGroup, string compileItemGroup) { string text = File.ReadAllText(_codeGenTemplatePath + "\\ModuleCsProj.txt"); text = text.Replace("$$ModuleName$$", projectName); text = text.Replace("$$ModuleProjectGuid$$", projectGuid); - text = text.Replace("$$FileIncludes$$", itemGroup ?? ""); + text = text.Replace("$$ContentIncludes$$", contentItemGroup ?? ""); + text = text.Replace("$$CompileIncludes$$", compileItemGroup ?? ""); text = text.Replace("$$OrchardReferences$$", GetOrchardReferences()); return text; } @@ -402,7 +405,7 @@ namespace Orchard.CodeGeneration.Commands { // create new csproj for the theme if (projectGuid != null) { var itemGroup = CreateProjectItemGroup(themePath, createdFiles, createdFolders); - string projectText = CreateCsProject(themeName, projectGuid, itemGroup); + string projectText = CreateCsProject(themeName, projectGuid, itemGroup, null); File.WriteAllText(themePath + "\\" + themeName + ".csproj", projectText); } @@ -464,6 +467,23 @@ namespace Orchard.CodeGeneration.Commands { return string.Format(CultureInfo.InvariantCulture, "\r\n{0}\r\n \r\n ", contentInclude); } + private static string CreateCompileItemGroup(string relativeFromPath, HashSet compile) { + var compileInclude = ""; + if (relativeFromPath != null && !relativeFromPath.EndsWith("\\", StringComparison.OrdinalIgnoreCase)) { + relativeFromPath += "\\"; + } + else if (relativeFromPath == null) { + relativeFromPath = ""; + } + + if (compile != null && compile.Count > 0) { + compileInclude = string.Join("\r\n", + from file in compile + select " "); + } + return string.Format(CultureInfo.InvariantCulture, "\r\n{0}\r\n \r\n ", compileInclude); + } + private void AddFilesToOrchardThemesProject(TextWriter output, string itemGroup) { if (!File.Exists(_orchardThemesProj)) { output.WriteLine(T("Warning: Orchard.Themes project file could not be found at {0}", _orchardThemesProj)); diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt index e9433b3b5..864e6d3f7 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Tools to create Orchard components. FeatureDescription: Tools to create Orchard components. diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs index 2add6a110..f6a7886d7 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt index 840e0a0ed..9614cd1bd 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs index bb3597977..7f7fbd8d0 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Module.txt b/src/Orchard.Web/Modules/Orchard.Conditions/Module.txt index e9d38d0ad..0257f3f43 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a rules API that evaluate to true or false. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj index 5aae5faa9..cdf31e39a 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj @@ -93,7 +93,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Conditions/Properties/AssemblyInfo.cs index a9dca2a32..2bd36dba7 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt index 2b7f988f6..e5c0d08b2 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt @@ -2,7 +2,7 @@ Name: Orchard.ContentPermissions AntiForgery: enabled Author: Chris Pyle, Sébastien Ros Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Allows item-level front end view permissions. Features: diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs index e604ced65..e3900b107 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt index c2caf61de..544495ae6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt @@ -2,7 +2,7 @@ Name: Orchard.ContentPicker AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: UI for selecting Content Items. Features: diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs index 8b6f3b1dd..205432963 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt index 2b6da95d1..3dac6a5f3 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: ContentTypes modules enables the creation and alteration of content types not based on code. Dependencies: Contents diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs index a5612e54d..da7fddd76 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt b/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt index e6d11ec8b..f894b0650 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt @@ -2,7 +2,7 @@ Name: Custom Forms AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 LifecycleStatus: Deprecated Description: Create custom forms like contact forms or content contributions. diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs index 0265d0b40..8f1efd48c 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Module.txt b/src/Orchard.Web/Modules/Orchard.Dashboards/Module.txt index 933c37e12..c89dddb23 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Dashboards module enables administrators to customize the dashboard screen of the administration UI of the application. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj index d0653b952..c426b5143 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj @@ -99,7 +99,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Dashboards/Properties/AssemblyInfo.cs index e0e3bd115..da4339c40 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt index 133880a70..fb1f8d6d4 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Contains designer tools to ease the Themes development process FeatureName: Shape Tracing diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs index 727cdd933..26f564e4c 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt index ba30a561f..766b597bc 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt @@ -2,7 +2,7 @@ Name: Dynamic Forms AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net/ -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Create custom forms like contact forms using layouts. Features: diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj index 9ad4ccfe6..e3133ef21 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj @@ -124,7 +124,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs index 4d966749c..2bbf705d9 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml index 6fc93195b..66b68d91e 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml @@ -22,8 +22,8 @@ @if (partDescriptor.BindingContexts.Any()) { foreach (var partBinding in partDescriptor.BindingContexts.SelectMany(x => x.Bindings)) { - var partBindingId = String.Format("binding-{0}-{1}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), partBinding.Name.HtmlClassify()); - var partBindingState = partState.Bindings.ElementAtOrDefault(partBindingIndex) ?? new BindingSettings(); + var partBindingId = String.Format("binding-{0}-{1}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), partBinding.Name.HtmlClassify()); + var partBindingState = partState.Bindings.FirstOrDefault(f => f.Name == partBinding.Name) ?? new BindingSettings(); @@ -36,7 +36,7 @@ } @foreach (var fieldDescriptor in partDescriptor.FieldBindings) { var fieldBindingIndex = 0; - var fieldState = partState.Fields.ElementAtOrDefault(fieldIndex) ?? new FieldBindingSettings(); + var fieldState = partState.Fields.FirstOrDefault(f=>f.Name == fieldDescriptor.Field.Name) ?? new FieldBindingSettings(); if (fieldDescriptor.BindingContexts.Any()) { foreach (var fieldBinding in fieldDescriptor.BindingContexts.SelectMany(x => x.Bindings)) { var fieldBindingId = String.Format("binding-{0}-{1}-{2}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), fieldDescriptor.Field.Name.HtmlClassify(), fieldBinding.Name.HtmlClassify()); diff --git a/src/Orchard.Web/Modules/Orchard.Email/Module.txt b/src/Orchard.Web/Modules/Orchard.Email/Module.txt index 3561de0f2..259382133 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Email/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Email Messaging module adds Email sending functionalities. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs index 458caaee6..09a8accf4 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs index 683e712e9..012009b37 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs @@ -34,26 +34,22 @@ namespace Orchard.Fields.Drivers { } protected override DriverResult Editor(ContentPart part, BooleanField field, dynamic shapeHelper) { - // if the content item is new, assign the default value - if(!part.HasDraft() && !part.HasPublished()) { - var settings = field.PartFieldDefinition.Settings.GetModel(); - field.Value = settings.DefaultValue; - } - return ContentShape("Fields_Boolean_Edit", GetDifferentiator(field, part), - () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part))); + () => { + if (part.IsNew()) { + var settings = field.PartFieldDefinition.Settings.GetModel(); + field.Value = settings.DefaultValue; + } + return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part)); + }); } protected override DriverResult Editor(ContentPart part, BooleanField field, IUpdateModel updater, dynamic shapeHelper) { if (updater.TryUpdateModel(field, GetPrefix(field, part), null, null)) { var settings = field.PartFieldDefinition.Settings.GetModel(); + if (!settings.Optional && !field.Value.HasValue) { - if (settings.DefaultValue.HasValue) { - field.Value = settings.DefaultValue; - } - else { - updater.AddModelError(field.Name, T("The field {0} is mandatory.", T(field.DisplayName))); - } + updater.AddModelError(field.Name, T("The field {0} is mandatory.", T(field.DisplayName))); } } diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs index 4626e1a4e..cc5512d4e 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs @@ -77,7 +77,7 @@ namespace Orchard.Fields.Drivers { protected override DriverResult Editor(ContentPart part, DateTimeField field, dynamic shapeHelper) { var settings = field.PartFieldDefinition.Settings.GetModel(); - var value = field.DateTime; + var value = part.IsNew() ? settings.DefaultValue : field.DateTime; var options = new DateLocalizationOptions(); // Don't do any time zone conversion if field is semantically a date-only field, because that might mutate the date component. @@ -98,7 +98,6 @@ namespace Orchard.Fields.Drivers { Name = field.DisplayName, Hint = settings.Hint, IsRequired = settings.Required, - HasDefaultValue = settings.DefaultValue.HasValue, Editor = new DateTimeEditor() { Date = showDate ? DateLocalizationServices.ConvertToLocalizedDateString(value, options) : null, Time = showTime ? DateLocalizationServices.ConvertToLocalizedTimeString(value, options) : null, @@ -137,37 +136,26 @@ namespace Orchard.Fields.Drivers { var showTime = settings.Display == DateTimeFieldDisplays.DateAndTime || settings.Display == DateTimeFieldDisplays.TimeOnly; DateTime? value = null; - var IsParseError = false; - // If required and one field is missing, don't try to parse data. - if (settings.Required && ((showDate && String.IsNullOrWhiteSpace(viewModel.Editor.Date)) || (showTime && String.IsNullOrWhiteSpace(viewModel.Editor.Time)))) { - // And use the default value only if all required fields are empty. - if (!showDate || !showTime || (String.IsNullOrWhiteSpace(viewModel.Editor.Date) && String.IsNullOrWhiteSpace(viewModel.Editor.Time))) { - value = settings.DefaultValue; - } - } - else { + // Try to parse data if not required or if there are no missing fields. + if (!settings.Required || ((!showDate || !String.IsNullOrWhiteSpace(viewModel.Editor.Date)) && (!showTime || !String.IsNullOrWhiteSpace(viewModel.Editor.Time)))) { try { - var utcDateTime = DateLocalizationServices.ConvertFromLocalizedString(viewModel.Editor.Date, viewModel.Editor.Time, options); - value = utcDateTime.HasValue ? utcDateTime : settings.DefaultValue; + value = DateLocalizationServices.ConvertFromLocalizedString(viewModel.Editor.Date, viewModel.Editor.Time, options); } catch { - IsParseError = true; updater.AddModelError(GetPrefix(field, part), T("{0} could not be parsed as a valid date and time.", field.DisplayName)); } } - if (!IsParseError) { - // Hackish workaround to make sure a time-only field with an entered time equivalent to - // 00:00 UTC doesn't get stored as a full DateTime.MinValue in the database, resulting - // in it being interpreted as an empty value when subsequently retrieved. - if (value.HasValue && settings.Display == DateTimeFieldDisplays.TimeOnly && value == DateTime.MinValue) { - value = value.Value.AddDays(1); - } + // Hackish workaround to make sure a time-only field with an entered time equivalent to + // 00:00 UTC doesn't get stored as a full DateTime.MinValue in the database, resulting + // in it being interpreted as an empty value when subsequently retrieved. + if (value.HasValue && settings.Display == DateTimeFieldDisplays.TimeOnly && value == DateTime.MinValue) { + value = value.Value.AddDays(1); + } - if (settings.Required && (!value.HasValue || (settings.Display != DateTimeFieldDisplays.TimeOnly && value.Value.Date == DateTime.MinValue))) { - updater.AddModelError(GetPrefix(field, part), T("{0} is required.", field.DisplayName)); - } + if (settings.Required && (!value.HasValue || (settings.Display != DateTimeFieldDisplays.TimeOnly && value.Value.Date == DateTime.MinValue))) { + updater.AddModelError(GetPrefix(field, part), T("{0} is required.", field.DisplayName)); } field.DateTime = value.HasValue ? value.Value : DateTime.MinValue; diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs index 46082bf7a..3f5f379f6 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs @@ -4,7 +4,6 @@ using Orchard.ContentManagement.Handlers; using Orchard.Fields.Fields; using Orchard.Fields.Settings; using Orchard.Localization; -using Orchard.Tokens; using System; using System.Collections.Generic; using System.Linq; @@ -13,11 +12,9 @@ namespace Orchard.Fields.Drivers { public class EnumerationFieldDriver : ContentFieldDriver { public IOrchardServices Services { get; set; } private const string TemplateName = "Fields/Enumeration.Edit"; - private readonly ITokenizer _tokenizer; - public EnumerationFieldDriver(IOrchardServices services, ITokenizer tokenizer) { + public EnumerationFieldDriver(IOrchardServices services) { Services = services; - _tokenizer = tokenizer; T = NullLocalizer.Instance; } @@ -39,13 +36,12 @@ namespace Orchard.Fields.Drivers { protected override DriverResult Editor(ContentPart part, EnumerationField field, dynamic shapeHelper) { return ContentShape("Fields_Enumeration_Edit", GetDifferentiator(field, part), () => { - if (field.Value == null) { + if (part.IsNew()) { var settings = field.PartFieldDefinition.Settings.GetModel(); if (!String.IsNullOrWhiteSpace(settings.DefaultValue)) { - field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary { { "Content", part.ContentItem } }); + field.Value = settings.DefaultValue; } } - return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part)); }); } @@ -54,15 +50,6 @@ namespace Orchard.Fields.Drivers { if (updater.TryUpdateModel(field, GetPrefix(field, part), null, null)) { var settings = field.PartFieldDefinition.Settings.GetModel(); - if (field.SelectedValues.Length == 0 && !String.IsNullOrWhiteSpace(settings.DefaultValue) && !String.IsNullOrWhiteSpace(settings.Options)) { - field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary { { "Content", part.ContentItem } }); - - string[] options = settings.Options.Split(new string[] { System.Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); - var selectedValues = field.SelectedValues.ToList(); - selectedValues.RemoveAll(value => !options.Any(value.Equals)); - field.SelectedValues = selectedValues.ToArray(); - } - if (settings.Required && field.SelectedValues.Length == 0) { updater.AddModelError(field.Name, T("The field {0} is mandatory", T(field.DisplayName))); } diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs index b56fdc79d..1300df8c1 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs @@ -4,19 +4,15 @@ using Orchard.ContentManagement.Handlers; using Orchard.Fields.Fields; using Orchard.Fields.Settings; using Orchard.Localization; -using Orchard.Tokens; using System; -using System.Collections.Generic; namespace Orchard.Fields.Drivers { public class InputFieldDriver : ContentFieldDriver { public IOrchardServices Services { get; set; } private const string TemplateName = "Fields/Input.Edit"; - private readonly ITokenizer _tokenizer; - public InputFieldDriver(IOrchardServices services, ITokenizer tokenizer) { + public InputFieldDriver(IOrchardServices services) { Services = services; - _tokenizer = tokenizer; T = NullLocalizer.Instance; } @@ -39,17 +35,19 @@ namespace Orchard.Fields.Drivers { protected override DriverResult Editor(ContentPart part, InputField field, dynamic shapeHelper) { return ContentShape("Fields_Input_Edit", GetDifferentiator(field, part), - () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part))); + () => { + if (part.IsNew()) { + var settings = field.PartFieldDefinition.Settings.GetModel(); + field.Value = settings.DefaultValue; + } + return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part)); + }); } protected override DriverResult Editor(ContentPart part, InputField field, IUpdateModel updater, dynamic shapeHelper) { if (updater.TryUpdateModel(field, GetPrefix(field, part), null, null)) { var settings = field.PartFieldDefinition.Settings.GetModel(); - if (String.IsNullOrWhiteSpace(field.Value) && !String.IsNullOrWhiteSpace(settings.DefaultValue)) { - field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary { { "Content", part.ContentItem } }); - } - if (settings.Required && String.IsNullOrWhiteSpace(field.Value)) { updater.AddModelError(GetPrefix(field, part), T("The field {0} is mandatory.", T(field.DisplayName))); } diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs index 0cf563921..554dee027 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs @@ -4,7 +4,6 @@ using Orchard.ContentManagement.Handlers; using Orchard.Fields.Fields; using Orchard.Fields.Settings; using Orchard.Localization; -using Orchard.Tokens; using System; using System.Collections.Generic; @@ -12,11 +11,9 @@ namespace Orchard.Fields.Drivers { public class LinkFieldDriver : ContentFieldDriver { public IOrchardServices Services { get; set; } private const string TemplateName = "Fields/Link.Edit"; - private readonly ITokenizer _tokenizer; - public LinkFieldDriver(IOrchardServices services, ITokenizer tokenizer) { + public LinkFieldDriver(IOrchardServices services) { Services = services; - _tokenizer = tokenizer; T = NullLocalizer.Instance; } @@ -39,21 +36,20 @@ namespace Orchard.Fields.Drivers { protected override DriverResult Editor(ContentPart part, LinkField field, dynamic shapeHelper) { return ContentShape("Fields_Link_Edit", GetDifferentiator(field, part), - () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part))); + () => { + if (part.IsNew()) { + var settings = field.PartFieldDefinition.Settings.GetModel(); + field.Value = settings.DefaultValue; + field.Text = settings.TextDefaultValue; + } + return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part)); + }); } protected override DriverResult Editor(ContentPart part, LinkField field, IUpdateModel updater, dynamic shapeHelper) { if (updater.TryUpdateModel(field, GetPrefix(field, part), null, null)) { var settings = field.PartFieldDefinition.Settings.GetModel(); - if (String.IsNullOrWhiteSpace(field.Value) && !String.IsNullOrWhiteSpace(settings.DefaultValue)) { - field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary { { "Content", part.ContentItem } }); - } - - if(!String.IsNullOrWhiteSpace(settings.TextDefaultValue) && String.IsNullOrWhiteSpace(field.Text)) { - field.Text = _tokenizer.Replace(settings.TextDefaultValue, new Dictionary { { "Content", part.ContentItem } }); - } - if (settings.Required && String.IsNullOrWhiteSpace(field.Value)) { updater.AddModelError(GetPrefix(field, part), T("Url is required for {0}", field.DisplayName)); } diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs index 22d1dbeef..583c225e6 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs @@ -5,7 +5,6 @@ using Orchard.Fields.Fields; using Orchard.Fields.Settings; using Orchard.Fields.ViewModels; using Orchard.Localization; -using Orchard.Tokens; using System; using System.Collections.Generic; using System.Globalization; @@ -15,11 +14,9 @@ namespace Orchard.Fields.Drivers { public IOrchardServices Services { get; set; } private const string TemplateName = "Fields/Numeric.Edit"; private readonly Lazy _cultureInfo; - private readonly ITokenizer _tokenizer; - public NumericFieldDriver(IOrchardServices services, ITokenizer tokenizer) { + public NumericFieldDriver(IOrchardServices services) { Services = services; - _tokenizer = tokenizer; T = NullLocalizer.Instance; _cultureInfo = new Lazy(() => CultureInfo.GetCultureInfo(Services.WorkContext.CurrentCulture)); @@ -46,10 +43,13 @@ namespace Orchard.Fields.Drivers { protected override DriverResult Editor(ContentPart part, NumericField field, dynamic shapeHelper) { return ContentShape("Fields_Numeric_Edit", GetDifferentiator(field, part), () => { + var settings = field.PartFieldDefinition.Settings.GetModel(); + var value = part.IsNew() ? settings.DefaultValue : Convert.ToString(field.Value, _cultureInfo.Value); + var model = new NumericFieldViewModel { Field = field, - Settings = field.PartFieldDefinition.Settings.GetModel(), - Value = Convert.ToString(field.Value, _cultureInfo.Value) + Settings = settings, + Value = value }; return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: GetPrefix(field, part)); @@ -64,10 +64,6 @@ namespace Orchard.Fields.Drivers { var settings = field.PartFieldDefinition.Settings.GetModel(); - if (String.IsNullOrWhiteSpace(viewModel.Value) && !String.IsNullOrWhiteSpace(settings.DefaultValue)) { - viewModel.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary { { "Content", part.ContentItem } }); - } - field.Value = null; if (String.IsNullOrWhiteSpace(viewModel.Value)) { @@ -76,7 +72,7 @@ namespace Orchard.Fields.Drivers { } } else if (!Decimal.TryParse(viewModel.Value, NumberStyles.Any, _cultureInfo.Value, out value)) { - updater.AddModelError(GetPrefix(field, part), T("{0} or its default value is an invalid number", field.DisplayName)); + updater.AddModelError(GetPrefix(field, part), T("{0} is an invalid number", field.DisplayName)); } else { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/TextFieldDriver.cs deleted file mode 100644 index dfb816aa4..000000000 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/TextFieldDriver.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Orchard.ContentManagement; -using Orchard.ContentManagement.Drivers; -using Orchard.Core.Common.Fields; -using Orchard.Core.Common.Settings; -using Orchard.Localization; -using Orchard.Tokens; -using System; -using System.Collections.Generic; - -namespace Orchard.Fields.Drivers { - // The original driver of the TextField is in Orchard.Core, where tokenization can not be used. - // This driver was added so the default value of the TextField can be tokenized. - public class TextFieldDriver : ContentFieldDriver { - private readonly ITokenizer _tokenizer; - - public TextFieldDriver(ITokenizer tokenizer) { - _tokenizer = tokenizer; - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - - protected override DriverResult Editor(ContentPart part, TextField field, IUpdateModel updater, dynamic shapeHelper) { - var settings = field.PartFieldDefinition.Settings.GetModel(); - - if (!String.IsNullOrWhiteSpace(settings.DefaultValue) && (String.IsNullOrWhiteSpace(field.Value) || field.Value.Equals(settings.DefaultValue))) { - field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary { { "Content", part.ContentItem } }); - - if (settings.Required && String.IsNullOrWhiteSpace(field.Value)) { - updater.AddModelError("Text", T("The field {0} is mandatory", T(field.DisplayName))); - } - } - - return null; - } - } -} diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Module.txt b/src/Orchard.Web/Modules/Orchard.Fields/Module.txt index 02cd276bb..2099ea0db 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Fields/Module.txt @@ -1,8 +1,8 @@ Name: Fields AntiForgery: enabled -Author: Antoine Griffard, S�bastien Ros +Author: Antoine Griffard, Sébastien Ros Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Some content fields Features: diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj index 37440658d..354f9e1c8 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj +++ b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj @@ -100,7 +100,6 @@ - @@ -175,9 +174,6 @@ - - - diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs index f4c8472e3..1bea5f40b 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Fields/ViewModels/DateTimeFieldViewModel.cs b/src/Orchard.Web/Modules/Orchard.Fields/ViewModels/DateTimeFieldViewModel.cs index 5fea628c6..d140dcbd0 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/ViewModels/DateTimeFieldViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/ViewModels/DateTimeFieldViewModel.cs @@ -6,6 +6,5 @@ namespace Orchard.Fields.ViewModels { public string Hint { get; set; } public bool IsRequired { get; set; } public DateTimeEditor Editor { get; set; } - public bool HasDefaultValue { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/DateTimeFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/DateTimeFieldSettings.cshtml index 4d8961aa8..2254ef8a4 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/DateTimeFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/DateTimeFieldSettings.cshtml @@ -50,7 +50,7 @@
@Html.EditorFor(m => m.Editor) - @T("Pick a default date for the field. (optional)") + @T("Pick a default date to be proposed when creating a content item. (optional)") @Html.ValidationMessageFor(m => m.Editor)
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml index d9b5f14fa..c11d5ba73 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml @@ -31,8 +31,9 @@
- @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large tokenized ui-autocomplete-input" }) - @T("Enter a default option for the field. You can use tokens in this field. If there is no equivalent choice among Options, it will not be used. (optional)") + @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large" }) + @T("The default option proposed when creating a content item. If there is no equivalent choice among Options, it will not be used. (optional)") + @T("When using the Listbox or Checkbox List mode, you can define multiple options separated by a semicolon.") @Html.ValidationMessageFor(m => m.DefaultValue)
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/InputFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/InputFieldSettings.cshtml index 59ea5b344..34fbee18f 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/InputFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/InputFieldSettings.cshtml @@ -1,5 +1,4 @@ @model Orchard.Fields.Settings.InputFieldSettings -@using Orchard.Fields.Settings;
@@ -80,8 +79,8 @@
- @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large tokenized ui-autocomplete-input" }) - @T("Default value for the field. You can use tokens in this field. If there is no value given for the actual field, this will be filled in. (optional)") + @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large" }) + @T("The default value proposed when creating a content item. (optional)") @Html.ValidationMessageFor(m => m.DefaultValue)
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/LinkFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/LinkFieldSettings.cshtml index 42e6c8504..b6ebaa61d 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/LinkFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/LinkFieldSettings.cshtml @@ -63,16 +63,16 @@
- @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large tokenized ui-autocomplete-input" }) - @T("A valid url as a default value, i.e. http://orchardproject.net, /content/file.pdf ... You can use tokens in this field. (optional)") + @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large" }) + @T("A valid url proposed when creating a content item, i.e. http://orchardproject.net, /content/file.pdf, ... (optional)") @Html.ValidationMessageFor(m => m.DefaultValue)
- @Html.TextBoxFor(m => m.TextDefaultValue, new { @class = "text large tokenized ui-autocomplete-input" }) - @T("If the Link text is set to Optional or Required, a default value can be set for it. You can use tokens in this field. (optional)") + @Html.TextBoxFor(m => m.TextDefaultValue, new { @class = "text large" }) + @T("The default link text proposed when creating a content item. (optional)") @Html.ValidationMessageFor(m => m.TextDefaultValue)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml index ceaf210b2..4fe3e888f 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml @@ -50,8 +50,6 @@
- @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large tokenized ui-autocomplete-input" }) - @T("The default value for the field. It must be a number, and if not it will not be shown. Make sure to set the Scale property if the value is not an integer. You can use tokens in this field. (optional)") @Html.ValidationMessageFor(m => m.DefaultValue)
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml deleted file mode 100644 index a35bea691..000000000 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/TextFieldDefaultValueEditor.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@model Orchard.Core.Common.ViewModels.TextFieldSettingsEventsViewModel -@* This override is here so that the token helper can be used on the default value's textbox, which can not be used in Orchard.Core. *@ - - -@Html.TextBoxFor(m => m.Settings.DefaultValue, new { @class = "text large tokenized ui-autocomplete-input" }) -@T("Default value for the field. You can use tokens in this field. If there is no value given for the actual field, this will be filled in. (optional)") -@Html.ValidationMessageFor(m => m.Settings.DefaultValue) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/DateTime.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/DateTime.Edit.cshtml index 5c2d90e4b..999e87d9c 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/DateTime.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/DateTime.Edit.cshtml @@ -6,7 +6,4 @@ @if (HasText(Model.Hint)) { @Model.Hint } - @if (Model.HasDefaultValue) { - @T("If the field is left empty then the default value will be used if one is configured.") - }
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml index 8c89ec5ab..1e2b07774 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml @@ -3,27 +3,26 @@ @{ var settings = Model.PartFieldDefinition.Settings.GetModel(); string[] options = (!String.IsNullOrWhiteSpace(settings.Options)) ? settings.Options.Split(new string[] { System.Environment.NewLine }, StringSplitOptions.None) : new string[] { T("Select an option").ToString() }; - var isRequired = settings.Required && String.IsNullOrWhiteSpace(settings.DefaultValue); }
@switch (settings.ListMode) { case ListMode.Dropdown: - @Html.DropDownListFor(m => m.Value, new SelectList(options, Model.Value), isRequired ? new { required = "required" } : null) + @Html.DropDownListFor(m => m.Value, new SelectList(options, Model.Value), settings.Required ? new { required = "required" } : null) break; case ListMode.Radiobutton: foreach (var option in options) { if (string.IsNullOrWhiteSpace(option)) { - } + } else { - } + } } break; case ListMode.Listbox: - @Html.ListBoxFor(m => m.SelectedValues, new MultiSelectList(options, Model.SelectedValues), isRequired ? new { required = "required" } : null) + @Html.ListBoxFor(m => m.SelectedValues, new MultiSelectList(options, Model.SelectedValues), settings.Required ? new { required = "required" } : null) break; case ListMode.Checkbox: @@ -45,7 +44,4 @@ @if (HasText(settings.Hint)) { @settings.Hint } - @if (!String.IsNullOrWhiteSpace(settings.DefaultValue)) { - @T("If no option is selected then the default value will be used.") - }
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Input.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Input.Edit.cshtml index bada13f3e..5cdfd1bbf 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Input.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Input.Edit.cshtml @@ -1,18 +1,13 @@ -@model Orchard.Fields.Fields.InputField -@using Orchard.Utility.Extensions; +@model InputField @using Orchard.Fields.Settings; @{ var settings = Model.PartFieldDefinition.Settings.GetModel(); - var isRequired = settings.Required && String.IsNullOrWhiteSpace(settings.DefaultValue); }
- title="@settings.Title" } value="@Model.Value" @if (isRequired) { required="required" } @if (settings.AutoFocus) { autofocus="autofocus" } @if (settings.AutoComplete) { autocomplete="on" } @if (!String.IsNullOrWhiteSpace(settings.Placeholder)) { placeholder="@settings.Placeholder" } @if (!String.IsNullOrWhiteSpace(settings.Pattern)) { pattern="@settings.Pattern" } @if (!String.IsNullOrWhiteSpace(settings.EditorCssClass)) { class="@settings.EditorCssClass" } else { class="text medium" } @if (settings.MaxLength > 1) { maxlength="@settings.MaxLength.ToString()" } /> + title="@settings.Title" } value="@Model.Value" @if (settings.Required) { required="required" } @if (settings.AutoFocus) { autofocus="autofocus" } @if (settings.AutoComplete) { autocomplete="on" } @if (!String.IsNullOrWhiteSpace(settings.Placeholder)) { placeholder="@settings.Placeholder" } @if (!String.IsNullOrWhiteSpace(settings.Pattern)) { pattern="@settings.Pattern" } @if (!String.IsNullOrWhiteSpace(settings.EditorCssClass)) { class="@settings.EditorCssClass" } else { class="text medium" } @if (settings.MaxLength > 1) { maxlength="@settings.MaxLength.ToString()" } /> @Html.ValidationMessageFor(m => m.Value) @if (HasText(settings.Hint)) { @settings.Hint } - @if (!String.IsNullOrWhiteSpace(settings.DefaultValue)) { - @T("If the field is left empty then the default value will be used.") - }
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml index 968e6cb44..af36ee128 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml @@ -14,9 +14,6 @@ target = "_top"; break; } - - var isRequired = settings.Required && String.IsNullOrWhiteSpace(settings.DefaultValue); - var isTextRequired = settings.LinkTextMode == LinkTextMode.Required && String.IsNullOrWhiteSpace(settings.TextDefaultValue); }
@@ -24,27 +21,19 @@ @settings.Hint }
- +
@(isRequired ? Html.TextBoxFor(m => m.Value, new { @class = "text large", placeholder = settings.UrlPlaceholder, required = "required" }) : Html.TextBoxFor(m => m.Value, new { @class = "text large", placeholder = settings.UrlPlaceholder })) @T("A valid url, i.e. http://orchardproject.net, /content/file.pdf, ...")
- @if (!String.IsNullOrWhiteSpace(settings.DefaultValue)) { - @T("If the field is left empty then the default value will be used.") - } @if (settings.LinkTextMode == LinkTextMode.Optional || settings.LinkTextMode == LinkTextMode.Required) {
- +
@(isTextRequired ? Html.TextBoxFor(m => m.Text, new { @class = "text medium", placeholder = settings.UrlPlaceholder, required = "required" }) : Html.TextBoxFor(m => m.Text, new { @class = "text medium", placeholder = settings.UrlPlaceholder })) - @if (!String.IsNullOrWhiteSpace(settings.TextDefaultValue)) { - @T("If the field is left empty then the default value will be used.") - } - else { - @T("The text of the link. If left empty, the url will be used instead.") - } + @T("The text of the link. If left empty, the url will be used instead.")
} diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml index 14371914c..f9b9c1f8f 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml @@ -3,9 +3,6 @@ @using Orchard.Fields.Settings; @{ - var isRequired = Model.Settings.Required && String.IsNullOrWhiteSpace(Model.Settings.DefaultValue); - var hasValue = !String.IsNullOrWhiteSpace(Model.Value); - var attributes = new Dictionary(); attributes.Add("class", "text-small"); attributes.Add("type", "text"); attributes.Add("min", Model.Settings.Minimum.HasValue ? Model.Settings.Minimum.Value : 0); @@ -13,11 +10,11 @@ attributes.Add("step", Math.Pow(10, 0 - Model.Settings.Scale).ToString(CultureInfo.InvariantCulture)); attributes.Add("placeholder", Model.Settings.Placeholder); - if (isRequired) { + if (Model.Settings.Required) { attributes.Add("required", "required"); } - if (hasValue) { + if (!String.IsNullOrWhiteSpace(Model.Value)) { attributes.Add("Value", Model.Value); } } @@ -29,7 +26,4 @@ @if (HasText(Model.Settings.Hint)) { @Model.Settings.Hint } - @if (!String.IsNullOrWhiteSpace(Model.Settings.DefaultValue)) { - @T("If the field is left empty then the default value will be used.") - }
diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Module.txt b/src/Orchard.Web/Modules/Orchard.Forms/Module.txt index 5a9fe9afa..83ed4be32 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Forms/Module.txt @@ -2,7 +2,7 @@ Name: Forms AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a system to publish and alter html forms. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Forms/Properties/AssemblyInfo.cs index 4c1be4e97..80ed8c3a1 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Forms/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Module.txt b/src/Orchard.Web/Modules/Orchard.ImageEditor/Module.txt index 599484252..1968cdfd4 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Adds a client side image editor for Media Library Features: diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ImageEditor/Properties/AssemblyInfo.cs index 4c1f31ff7..22804a3a1 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt index 8c2f36639..29df8d1f6 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt @@ -3,7 +3,7 @@ Path: ImportExport AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides content item data import and export capability. Features: diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs index 5011fa7d0..24d90c209 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt b/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt index 1cefde7b3..8141f7adc 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Indexing module enables the site to be indexed. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site. FeatureDescription: Indexing infrastructure. Requires an index implementation like the Lucene module. diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs index 9ab131fb3..7ed563bac 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt b/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt index 478e242fb..b9dc23426 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: This module provides a jobs queue to process jobs asynchronously. Features: diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs index 05c2b3d31..da7e0dad6 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt index 85b344108..626a1a950 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Category: Layout Description: Provides tools to create layouts. diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj index 66ccc72b6..0f3d26d58 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj @@ -181,7 +181,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Properties/AssemblyInfo.cs index f36b142d2..d0e348a1e 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Module.txt b/src/Orchard.Web/Modules/Orchard.Lists/Module.txt index 36bf71c00..a0945488f 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Lists/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Introduces a preconfigured container-enabled content type. FeatureDescription: A basic container-enabled content type. diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs index a1d0cae7e..8d5840445 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Module.txt b/src/Orchard.Web/Modules/Orchard.Localization/Module.txt index 9f5438f2b..c1609d29f 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Localization/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The localization module enables the localization of content items. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs index f9466e265..1c5548703 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs index 311b0a520..ddfa46ca1 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/OEmbedPartDriver.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/OEmbedPartDriver.cs index ccb637186..76f7d920e 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/OEmbedPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/OEmbedPartDriver.cs @@ -1,7 +1,12 @@ -using Orchard.ContentManagement.Drivers; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Drivers; +using Orchard.ContentManagement.FieldStorage.InfosetStorage; using Orchard.MediaLibrary.Models; +using System.Xml; +using System.Xml.Linq; -namespace Orchard.MediaLibrary.Drivers { +namespace Orchard.MediaLibrary.Drivers +{ public class OEmbedPartDriver : ContentPartDriver { protected override DriverResult Display(OEmbedPart part, string displayType, dynamic shapeHelper) { return Combined( @@ -13,18 +18,42 @@ namespace Orchard.MediaLibrary.Drivers { } protected override void Exporting(OEmbedPart part, ContentManagement.Handlers.ExportContentContext context) { - context.Element(part.PartDefinition.Name).SetAttributeValue("Source", part.Source); + var partName = XmlConvert.EncodeName(typeof(OEmbedPart).Name); + + var infosetPart = part.As(); + if (infosetPart != null) { + // OEmbedPart is not versionable thats why using Infoset.Element instead of VersionInfoset.Element + var element = infosetPart.Infoset.Element; + + var partElement = element.Element(partName); + if (partElement == null) + return; + + context.Element(partName).Add(partElement.Elements()); + } } protected override void Importing(OEmbedPart part, ContentManagement.Handlers.ImportContentContext context) { - // Don't do anything if the tag is not specified. - if (context.Data.Element(part.PartDefinition.Name) == null) { - return; - } + var partName = XmlConvert.EncodeName(typeof(OEmbedPart).Name); - context.ImportAttribute(part.PartDefinition.Name, "Source", source => - part.Source = source - ); + // Don't do anything if the tag is not specified. + var xmlElement = context.Data.Element(partName); + if (xmlElement == null) + return; + + var infosetPart = part.As(); + if (infosetPart != null) { + // OEmbedPart is not versionable thats why using Infoset.Element instead of VersionInfoset.Element + var element = infosetPart.Infoset.Element; + + var partElement = element.Element(partName); + if (partElement != null) + partElement.Remove(); + + partElement = new XElement(partName); + element.Add(partElement); + partElement.Add(xmlElement.Elements()); + } } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt index 8ff098ba9..fc93674f2 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides enhanced Media management tools. Features: diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Properties/AssemblyInfo.cs index cefee7537..69f64639a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs index 7205aa631..082191121 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs @@ -379,6 +379,8 @@ namespace Orchard.MediaLibrary.Services { Argument.ThrowIfNullOrEmpty(filename, "filename"); Argument.ThrowIfNullOrEmpty(newFilename, "newFilename"); + if (!_storageProvider.FolderExists(newPath)) + _storageProvider.TryCreateFolder(newPath); _storageProvider.RenameFile(_storageProvider.Combine(currentPath, filename), _storageProvider.Combine(newPath, newFilename)); } diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs index 6e5b144ec..dce5d9927 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt index 607348c05..eceed599f 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: John Murdock, Sébastien Ros Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Module for processing Media e.g. image resizing Category: Media diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs index 49bd80ecd..986ca9bfd 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Module.txt b/src/Orchard.Web/Modules/Orchard.MessageBus/Module.txt index 236ff7423..6d2e37019 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides communication APIs for server farms. Features: diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj index 04858a91b..3c738d042 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj @@ -103,7 +103,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MessageBus/Properties/AssemblyInfo.cs index 6e33d89bc..e6a05a8b2 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt index 75a969a1a..c7bd03f88 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Data migration commands. FeatureDescription: Data migration commands. diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs index 7d6939291..55087798a 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt index cab6a6325..9b55fe8bb 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The Modules module enables the administrator of the site to manage the installed modules as well as activate and de-activate features. FeatureDescription: Standard module and feature management. diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs index 7cdccf8bf..97187fa59 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt index c7ce927d2..931152791 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt @@ -3,7 +3,7 @@ Path: MultiTenancy AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The multi-tenancy module enables multiple Orchard sites to run in isolation inside of a single web application, improving site density on a single server or hosted account. FeatureDescription: Configure multiple site tenants. diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs index 8ccd8dcdc..f22e644f3 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index d7e446d3c..21fc75f5d 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -370,6 +370,9 @@ namespace Orchard.OutputCache.Filters { foreach (var p in filterContext.ActionParameters) result.Add("PARAM:" + p.Key, p.Value); + // Vary by scheme. + result.Add("scheme", filterContext.RequestContext.HttpContext.Request.Url.Scheme); + // Vary by theme. result.Add("theme", _themeManager.GetRequestTheme(filterContext.RequestContext).Id.ToLowerInvariant()); @@ -384,7 +387,7 @@ namespace Orchard.OutputCache.Filters { // Vary by configured request headers. var requestHeaders = filterContext.RequestContext.HttpContext.Request.Headers; foreach (var varyByRequestHeader in CacheSettings.VaryByRequestHeaders) { - if (requestHeaders.AllKeys.Contains(varyByRequestHeader)) + if (requestHeaders[varyByRequestHeader]!=null) result["HEADER:" + varyByRequestHeader] = requestHeaders[varyByRequestHeader]; } diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt b/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt index d723805b5..d52174179 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net/ -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Adds output caching functionality Features: diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj index 99aeafd55..a3a7fa74c 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj @@ -103,7 +103,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs index b31edefd9..df6c2cd94 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt index 2c6d59f47..b9c46e08b 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The packaging module enables packaging modules using the OPC format. FeatureDescription: Commands for creating/installing local modules. diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs index eaffe6f63..2bff8527d 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt index 011563b52..d9ad93e1b 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Introduces a preconfigured page content type. FeatureDescription: A basic page content type. diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs index 7ae67fa33..ed6b769e4 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Module.txt b/src/Orchard.Web/Modules/Orchard.Projections/Module.txt index 01d03aa7a..479515161 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Projections/Module.txt @@ -2,7 +2,7 @@ Name: Projector AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides methods to control how lists of content items are filtered and displayed Category: Content diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs index a7dc2d95d..3858d071a 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs index 53e23f10f..4a94052c7 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt index 123a6584b..0395daac6 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt @@ -3,7 +3,7 @@ Path: PublishLater AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The PublishLater module introduces draft creation and scheduled publishing functionality. FeatureDescription: Draft creation and scheduled publishing. diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs index 16c675fee..31c1654e8 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt b/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt index bc1cf1d78..b8bfc062c 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides Orchard Recipes. FeatureDescription: Implementation of Orchard recipes. diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs index ba1ed7509..1846dbf25 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Module.txt b/src/Orchard.Web/Modules/Orchard.Redis/Module.txt index 0529c9fdb..ba0cc4050 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Redis/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides Redis integration with Orchard. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj index 54a7c11f1..74b0a342e 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj +++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj @@ -81,7 +81,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Redis/Properties/AssemblyInfo.cs index cabbd8c22..a42476ab0 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Redis/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Module.txt b/src/Orchard.Web/Modules/Orchard.Resources/Module.txt index ab51554b6..5848059db 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Resources/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.10 Description: Provides a variety of third-party client-side libraries (stylesheets and scripts) used by other modules. Priority: 5 diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj index 64b64351e..faad1da81 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj +++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj @@ -829,7 +829,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Resources/Properties/AssemblyInfo.cs index f32955ced..df2a2261e 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Resources/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Security; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Orchard.Resources")] @@ -14,8 +14,8 @@ using System.Security; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,13 +25,13 @@ using System.Security; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt index 1c2806af6..e663be50e 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The roles module is adding the ability to assign roles to users. It's also providing a set of default roles for which other modules can define default permissions. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs index 6bc130f16..20617e688 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs index 569e90f3f..7030c76ca 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt index 42d953e21..8ecbde6f8 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Description for the module Features: diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs index b3b31ce3d..004d87a7d 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt index de74a00a6..f5c8220db 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The DLR scripting module enables the possibility to execute scripts using the DLR. FeatureDescription: DLR scripting support. diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs index 4faa92288..1e3e0df78 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt b/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt index 7f67de3cb..fa60138af 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The scripting module enables the possibility to execute scripts using a simple custom scripting language. FeatureDescription: Scripting support. diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs index 689dbaa27..aeeedb2f1 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Search/Module.txt b/src/Orchard.Web/Modules/Orchard.Search/Module.txt index 8401053d1..1651c6dab 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Search/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The search module enables the management of the search index and provides the front-end searching user interface. diff --git a/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs index bed30d571..c4529cc56 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt index 8e2474347..97fdfd02d 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt @@ -2,7 +2,7 @@ Name: Secure Sockets Layer AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: This module will ensure SSL is used when accessing specific parts of the website like the dashboard, authentication pages or custom pages. FeatureName: Secure Sockets Layer diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs index 9772b48ac..f8f12be3d 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs index ebb75857f..a3e3ced50 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs @@ -97,7 +97,7 @@ namespace Orchard.SecureSocketsLayer.Services { if (!settings.CustomEnabled) return false; var urlHelper = new UrlHelper(requestContext); - var url = urlHelper.Action(actionName, controllerName, requestContext.RouteData); + var url = urlHelper.Action(actionName, controllerName, requestContext.RouteData.Values); if (String.IsNullOrWhiteSpace(url)) { return false; diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt index 93dc46ce7..dd1e33ee4 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt @@ -1,7 +1,7 @@ Name: Setup Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The setup module is creating the application's setup experience. FeatureDescription: Standard site setup. This feature is disabled automatically once setup is over. diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs index 1d213a592..7293e5c5a 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt index 633736aae..8426fb1db 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Features: Orchard.Tags: diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs index f3374173b..0a263747c 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt b/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt index a1f781332..6e840363a 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt @@ -2,7 +2,7 @@ Name: Task Lease AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 LifecycleStatus: Deprecated Description: Provides services to synchronize tasks in a farm environment. diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs index 76335ad5c..ea5068175 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt b/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt index 8665f23b3..04cc9d17a 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The taxonomy module is providing custom categorization of arbitrary content types. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs index faf5f0d08..f961dad0b 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Module.txt b/src/Orchard.Web/Modules/Orchard.Templates/Module.txt index d10066a5c..d4302b2f3 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Templates/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a Template type that can be used to store template code and used as a shape. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj index d8ebcb7be..6b0f6eae8 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj +++ b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj @@ -154,7 +154,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Templates/Properties/AssemblyInfo.cs index cd377a346..c11e65e32 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Templates/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Module.txt b/src/Orchard.Web/Modules/Orchard.Themes/Module.txt index 528f48d46..0069b6b3d 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Themes/Module.txt @@ -3,7 +3,7 @@ AntiForgery: enabled SessionState: required Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The themes module makes it possible for Orchard applications to customize the look and feel of an Orchard web site. FeatureDescription: Basic theming capability. diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs index 5df96d6e9..7e53d6b8e 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Module.txt b/src/Orchard.Web/Modules/Orchard.Tokens/Module.txt index 675e69f2e..4a7ad5064 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Module.txt @@ -2,7 +2,7 @@ Name: Tokens AntiForgery: enabled Author: The Orchard Team Website: http://www.orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a system for performing string replacements with common site values. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Properties/AssemblyInfo.cs index 878f8d8b5..805c3590e 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js b/src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js index f83cef9eb..fff9e6893 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js @@ -1,13 +1,13 @@ jQuery.fn.extend({ insertAtCaret: function (myValue) { - return this.each(function(i) { + return this.each(function (i) { if (document.selection) { //For browsers like Internet Explorer this.focus(); sel = document.selection.createRange(); sel.text = myValue; this.focus(); - } else if (this.selectionStart || this.selectionStart == '0') { + } else if (this.selectionStart || this.selectionStart === "0") { //For browsers like Firefox and Webkit based var startPos = this.selectionStart; var endPos = this.selectionEnd; @@ -26,19 +26,19 @@ }); jQuery.fn.extend({ - tokenized : function () { + tokenized: function () { return $(this).each(function () { var _this = $(this); - // add an icon to tokenized inputs - _this.wrap(''); - var popup = $('
 
') + // Add an icon to tokenized inputs. + _this.wrap(""); + var popup = $("
 
"); _this.parent().prepend(popup); - // show the full list of tokens when the icon is clicked - popup.children('.tokenized-popup').click(function () { + // Show the full list of tokens when the icon is clicked. + popup.children(".tokenized-popup").click(function () { var input = $(this).parent().next(); - // pass empty string as value to search for, displaying all results + // Pass empty string as value to search for, displaying all results. input.autocomplete("search", ""); input.focus(); }); @@ -51,14 +51,18 @@ jQuery.fn.extend({ return false; } }).each(function () { - $(this).data('ui-autocomplete')._renderItem = function (ul, item) { - var result = item.value == '' ? $('
  • ') : $("
  • "); + $(this).data("ui-autocomplete")._renderItem = function (ul, item) { + var result = item.value === "" ? $("
  • ") : $("
  • "); - var desc = item.desc.length > 50 ? item.desc.substring(0, 50) + "..." : item.desc; + // Place invisible space characters inside long strings to prevent word-wrap to split words. + var value = item.value.replace(/\./g, "\.\u200B"); + var label = item.label.replace(/,/g, ",\u200B"); return result .data("ui-autocomplete-item", item) - .append('' + $('
    ').text(item.label).html() + ' ' + $('
    ').text(item.value).html() + ' ' + $('
    ').text(desc).html() + "") + .append("
    " + $("
    ").text(label).html() + + "
    " + $("
    ").text(value).html() + + "
    " + $("
    ").text(item.desc).html() + "
    ") .appendTo(ul); }; }); @@ -66,14 +70,14 @@ jQuery.fn.extend({ }, }); -$(function() { +$(function () { $.tokens = {}; - // provide autocomplete behavior to tokenized inputs - // tokensUrl is initialized from the view + // Provide autocomplete behavior to tokenized inputs. + // tokensUrl is initialized from the view. $.get(tokensUrl, function (data) { $.tokens = data; - $('.tokenized').tokenized(); + $(".tokenized").tokenized(); }); -}); +}); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Styles/orchard-tokens-admin.css b/src/Orchard.Web/Modules/Orchard.Tokens/Styles/orchard-tokens-admin.css index f47bb0bdf..23a17fbc4 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Styles/orchard-tokens-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Styles/orchard-tokens-admin.css @@ -1,60 +1,54 @@ -.tokenized-popup -{ - position:absolute; +.tokenized-popup { + position: absolute; background: url('images/tokensPopup.gif'); background-repeat: no-repeat; - width:10px; - height:10px; + width: 10px; + height: 10px; cursor: pointer; - - padding-right:8px; - margin-top:0.15em; - right:100%; + padding-right: 8px; + margin-top: 0.15em; + right: 100%; } .token-wrapper { - position:relative; + position: relative; } .token-wrapper > div { - float:left; - left:100%; + float: left; + left: 100%; position: absolute; - margin-bottom: 0px; + margin-bottom: 0; } - .token-wrapper span[role="status"] { - display: none; - } -.ui-autocomplete -{ - max-height: 12em; +.token-wrapper span[role="status"] { + display: none; +} + +.ui-autocomplete { + max-height: 12em; background: white; border: 1px solid #BDBCBC; width: 700px; - overflow :auto; + overflow: auto; } -.ui-autocomplete .acdesc -{ +.ui-autocomplete .acdesc { padding-right: 5px; float: right; } - -.ui-autocomplete .acvalue -{ + +.ui-autocomplete .acvalue { left: 150px; position: absolute; } - -.ui-autocomplete .accategory -{ + +.ui-autocomplete .accategory { font-weight: bold; } .ui-autocomplete li a { - - padding-left: 5px; + padding-left: 1%; background-color: transparent; color: #333; } @@ -65,3 +59,21 @@ cursor: pointer; } +.ui-autocomplete .listitemtext { + display: inline-block; + vertical-align: top; + padding-right: 1%; + word-wrap: break-word; +} + +.ui-autocomplete .acdescmod { + width: 42%; +} + +.ui-autocomplete .acvaluemod { + width: 28%; +} + +.ui-autocomplete .aclabelmod { + width: 24%; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Properties/AssemblyInfo.cs index 418843c79..00d0acada 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Users/Module.txt b/src/Orchard.Web/Modules/Orchard.Users/Module.txt index 934da1bdb..4a22740bf 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Users/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The users module enables user management. Features: diff --git a/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs index 8f282f5ea..0f39fccc3 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt b/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt index 9aadd95b5..9e970c6b0 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides a mecanism to generate a static version of pages for being used during application warm up. FeatureDescription: Generates the static version of specific pages periodically. diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Warmup/Properties/AssemblyInfo.cs index f0c8e41a4..8fbeb03b2 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ using System.Security; // CHANGE ON THIS VERSION NEEDS TO BE APPLIED ON WEB.CONFIG TOO -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt b/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt index c8ac88336..032c301f7 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: An implementation of widgets for Orchard. FeatureDescription: An implementation of widgets. diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs index 3674a1dc2..55186040c 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Module.txt b/src/Orchard.Web/Modules/Orchard.Workflows/Module.txt index 3a1efae32..8b9b508dc 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Category: Workflows Description: Provides tools to create custom workflows. diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Properties/AssemblyInfo.cs index bfd2559b2..232ed2114 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt b/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt index 6deb5d757..83ae92e8d 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt @@ -3,7 +3,7 @@ Path: Orchard.jQuery AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 LifecycleStatus: Deprecated Description: The jQuery module contains the jQuery and related script libraries. diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs index 1b1a6aaab..42c6c7661 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/SysCache/Module.txt b/src/Orchard.Web/Modules/SysCache/Module.txt index 4006380ca..561a03894 100644 --- a/src/Orchard.Web/Modules/SysCache/Module.txt +++ b/src/Orchard.Web/Modules/SysCache/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Enables database caching using the SysCache provider. Features: diff --git a/src/Orchard.Web/Modules/SysCache/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/SysCache/Properties/AssemblyInfo.cs index abce8e50e..c43919e88 100644 --- a/src/Orchard.Web/Modules/SysCache/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/SysCache/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/TinyMce/Module.txt b/src/Orchard.Web/Modules/TinyMce/Module.txt index cb61bd654..2214a0e3a 100644 --- a/src/Orchard.Web/Modules/TinyMce/Module.txt +++ b/src/Orchard.Web/Modules/TinyMce/Module.txt @@ -2,7 +2,7 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: The TinyMCE module enables rich text contents to be created using a "What You See Is What You Get" user interface. FeatureDescription: TinyMCE HTML WYSIWYG editor. diff --git a/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs index 6f819ff49..84a12518b 100644 --- a/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Upgrade/Module.txt b/src/Orchard.Web/Modules/Upgrade/Module.txt index 78e0348e2..8291edb22 100644 --- a/src/Orchard.Web/Modules/Upgrade/Module.txt +++ b/src/Orchard.Web/Modules/Upgrade/Module.txt @@ -2,7 +2,7 @@ Name: Upgrade AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.10 +Version: 1.10.1 OrchardVersion: 1.9 Description: Provides actions for upgrading Orchard instances Category: Developer diff --git a/src/Orchard.Web/Modules/Upgrade/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Upgrade/Properties/AssemblyInfo.cs index 3f4512798..7db7f354e 100644 --- a/src/Orchard.Web/Modules/Upgrade/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Upgrade/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Security; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index 772800139..9d5640a46 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -118,7 +118,7 @@ - + diff --git a/src/Orchard.Web/Properties/AssemblyInfo.cs b/src/Orchard.Web/Properties/AssemblyInfo.cs index 71cdcc693..6922f0de3 100644 --- a/src/Orchard.Web/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs index 0860dc6cd..36e5bb4f8 100644 --- a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Orchard.Web/Themes/SafeMode/Theme.txt b/src/Orchard.Web/Themes/SafeMode/Theme.txt index bc6d2b8ae..de2409e09 100644 --- a/src/Orchard.Web/Themes/SafeMode/Theme.txt +++ b/src/Orchard.Web/Themes/SafeMode/Theme.txt @@ -1,6 +1,6 @@ Name: SafeMode Author: Jonathan Wall Description: The Orchard Theme for setup and failure conditions. -Version: 1.10 +Version: 1.10.1 Tags: hidden Website: http://www.orchardproject.net diff --git a/src/Orchard.Web/Themes/TheAdmin/Theme.txt b/src/Orchard.Web/Themes/TheAdmin/Theme.txt index 2c456caa6..269feeb82 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Theme.txt +++ b/src/Orchard.Web/Themes/TheAdmin/Theme.txt @@ -1,5 +1,5 @@ Name: The Admin -Version: 1.10 +Version: 1.10.1 Author: Jon Wall Tags: hidden, admin Description: The Orchard admin theme. diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt index 0fccae022..6c49589a3 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt +++ b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt @@ -1,7 +1,7 @@ Name: The Theme Machine Author: jowall, mibach, loudej, heskew Description: Orchard Theme Machine is a flexible multi-zone theme that provides a solid foundation to build your site. It features 20 collapsible widget zones and is flexible enough to cover a wide range of layouts. -Version: 1.10 +Version: 1.10.1 Tags: Awesome Website: http://orchardproject.net Zones: Header, Navigation, Featured, BeforeMain, AsideFirst, Messages, BeforeContent, Content, AfterContent, AsideSecond, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index cc10d9dab..13876a268 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -59,6 +59,10 @@ + + + + @@ -75,7 +79,6 @@ - diff --git a/src/Orchard/ContentManagement/ContentExtensions.cs b/src/Orchard/ContentManagement/ContentExtensions.cs index 10bba53bb..5df164723 100644 --- a/src/Orchard/ContentManagement/ContentExtensions.cs +++ b/src/Orchard/ContentManagement/ContentExtensions.cs @@ -234,5 +234,8 @@ namespace Orchard.ContentManagement { public static bool HasPublished(this IContent content) { return content.IsPublished() || content.ContentItem.ContentManager.Get(content.ContentItem.Id, VersionOptions.Published) != null; } + public static bool IsNew(this IContent content) { + return content.ContentItem.VersionRecord == null; + } } } diff --git a/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs b/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs index d027e900d..ececdd071 100644 --- a/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs +++ b/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs @@ -43,6 +43,9 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy { if (Uri.IsWellFormedUriString(fileName, UriKind.Absolute) || (fileName.StartsWith("//", StringComparison.InvariantCulture) && Uri.IsWellFormedUriString("http:" + fileName, UriKind.Absolute))) { + if (fileName.StartsWith("//", StringComparison.InvariantCulture)) { + fileName = "http:" + fileName; + } var uri = new Uri(fileName); shapeName = uri.Authority + "$" + uri.AbsolutePath + "$" + uri.Query; } diff --git a/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs index 12918fc7f..936183a8a 100644 --- a/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs +++ b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs @@ -6,6 +6,8 @@ using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; using Orchard.FileSystems.WebSite; using Orchard.Logging; +using Orchard.Environment.Descriptor.Models; +using System.Linq; namespace Orchard.Localization.Services { public class DefaultLocalizedStringManager : ILocalizedStringManager { @@ -15,6 +17,7 @@ namespace Orchard.Localization.Services { private readonly ILocalizationStreamParser _localizationStreamParser; private readonly ShellSettings _shellSettings; private readonly ISignals _signals; + private readonly ShellDescriptor _shellDescriptor; const string CoreLocalizationFilePathFormat = "~/Core/App_Data/Localization/{0}/orchard.core.po"; const string ModulesLocalizationFilePathFormat = "{0}/App_Data/Localization/{1}/orchard.module.po"; @@ -28,13 +31,15 @@ namespace Orchard.Localization.Services { ICacheManager cacheManager, ILocalizationStreamParser locationStreamParser, ShellSettings shellSettings, - ISignals signals) { + ISignals signals, + ShellDescriptor shellDescriptor) { _webSiteFolder = webSiteFolder; _extensionManager = extensionManager; _cacheManager = cacheManager; _localizationStreamParser = locationStreamParser; _shellSettings = shellSettings; _signals = signals; + _shellDescriptor = shellDescriptor; Logger = NullLogger.Instance; } @@ -138,7 +143,9 @@ namespace Orchard.Localization.Services { } foreach (var theme in _extensionManager.AvailableExtensions()) { - if (DefaultExtensionTypes.IsTheme(theme.ExtensionType)) { + if (DefaultExtensionTypes.IsTheme(theme.ExtensionType) && _shellDescriptor.Features.Any(x => x.Name == theme.Id)) + { + string themePath = string.Format(ThemesLocalizationFilePathFormat, theme.VirtualPath, culture); text = _webSiteFolder.ReadFile(themePath); if (text != null) { diff --git a/src/Orchard/Properties/AssemblyInfo.cs b/src/Orchard/Properties/AssemblyInfo.cs index 250ab77f6..c2ef37c5f 100644 --- a/src/Orchard/Properties/AssemblyInfo.cs +++ b/src/Orchard/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ using System.Security; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Package.json b/src/Package.json index 6b682863d..e6c48352f 100644 --- a/src/Package.json +++ b/src/Package.json @@ -15,6 +15,7 @@ "gulp-sourcemaps": "1.6.0", "gulp-less": "3.0.5", "gulp-cssnano": "2.1.1", + "gulp-sass": "2.3.1", "gulp-typescript": "2.11.0", "gulp-uglify": "1.5.2", "gulp-rename": "1.2.2", diff --git a/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs b/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs index d7aca6d27..4f6608a35 100644 --- a/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs +++ b/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs b/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs index 8b240d60c..6f4dfd7b0 100644 --- a/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs +++ b/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")] diff --git a/src/Tools/Orchard/Properties/AssemblyInfo.cs b/src/Tools/Orchard/Properties/AssemblyInfo.cs index f6051269a..c3a532084 100644 --- a/src/Tools/Orchard/Properties/AssemblyInfo.cs +++ b/src/Tools/Orchard/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.10")] -[assembly: AssemblyFileVersion("1.10")] +[assembly: AssemblyVersion("1.10.1")] +[assembly: AssemblyFileVersion("1.10.1")]