diff --git a/ClickToBuild.cmd b/ClickToBuild.cmd index 53e1c8d6c..1907d736b 100644 --- a/ClickToBuild.cmd +++ b/ClickToBuild.cmd @@ -31,6 +31,6 @@ IF "%solution%" == "" SET solution=src\Orchard.sln lib\nuget\nuget.exe restore %solution% -msbuild /t:%target% %project% /p:Solution=%solution% +msbuild /t:%target% %project% /p:Solution=%solution% /m pause \ No newline at end of file diff --git a/deploy.cmd b/deploy.cmd index 151965c59..610d2348e 100644 --- a/deploy.cmd +++ b/deploy.cmd @@ -72,7 +72,7 @@ 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 +call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Orchard.proj" /t:Precompiled /v:m /m IF !ERRORLEVEL! NEQ 0 goto error :: 3. KuduSync diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index e7843e528..3bfb322ed 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -61,8 +61,8 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True - - ..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 351a65220..454b993f6 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 40369c752..86092833a 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -65,8 +65,8 @@ ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll True - - ..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index 41efafd72..0d97f7f46 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 59450f75f..6e4fd9400 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -65,8 +65,8 @@ ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll True - - ..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index f5907c5b9..8b16dae3d 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 4a39036af..c6d108361 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -69,8 +69,8 @@ ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll True - - ..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 53387f572..0e919fd8f 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -3,7 +3,7 @@ - + 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 520eff940..0a28395b9 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 @@ -48,8 +48,8 @@ false - - ..\..\..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index 8428ab4a8..1e2280491 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs index d4f62b1db..e552837c4 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Web; using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.ContentManagement.Aspects; @@ -126,14 +127,14 @@ namespace Orchard.CustomForms.Controllers { _contentManager.Create(contentItem, VersionOptions.Draft); var model = _contentManager.UpdateEditor(contentItem, this); - + if (!ModelState.IsValid) { _transactionManager.Cancel(); // if custom form is inside a widget, we display the form itself if (form.ContentType == "CustomFormWidget") { foreach (var error in ModelState.Values.SelectMany(m => m.Errors).Select(e => e.ErrorMessage)) { - Services.Notifier.Error(T(error)); + Services.Notifier.Error(new LocalizedString(HttpUtility.HtmlEncode(error))); } // save the updated editor shape into TempData to survive a redirection and keep the edited values diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj index f3c149e3b..248e0641b 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj @@ -39,8 +39,8 @@ ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True - - ..\..\..\..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\..\..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index b0593f20b..223030f6f 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt b/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt index 9e970c6b0..f991e8cd2 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt @@ -4,6 +4,6 @@ Author: The Orchard Team Website: http://orchardproject.net 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. +Description: Provides a mechanism to generate a static version of pages for being used during application warm up. FeatureDescription: Generates the static version of specific pages periodically. Category: Hosting diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 9b469678e..02187c3eb 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -71,8 +71,8 @@ ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll True - - ..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll + + ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll True @@ -933,9 +933,7 @@ - - ASPXCodeBehind - + @@ -1015,9 +1013,7 @@ - - ASPXCodeBehind - + diff --git a/src/Orchard/UI/Navigation/NavigationHelper.cs b/src/Orchard/UI/Navigation/NavigationHelper.cs index b6cb0faa8..eb0803219 100644 --- a/src/Orchard/UI/Navigation/NavigationHelper.cs +++ b/src/Orchard/UI/Navigation/NavigationHelper.cs @@ -81,8 +81,14 @@ namespace Orchard.UI.Navigation { /// A stack with the selection path being the last node the currently selected one. public static Stack SetSelectedPath(IEnumerable menuItems, HttpRequestBase currentRequest, RouteValueDictionary currentRouteData) { // doing route data comparison first and if that fails, fallback to string-based URL lookup - var path = SetSelectedPath(menuItems, currentRequest, currentRouteData, false) - ?? SetSelectedPath(menuItems, currentRequest, currentRouteData, true); + var path = GetSelectedPath(menuItems, currentRequest, currentRouteData, false) + ?? GetSelectedPath(menuItems, currentRequest, currentRouteData, true); + + if(path != null) { + foreach(var menuItem in path) { + menuItem.Selected = true; + } + } return path; } @@ -95,13 +101,18 @@ namespace Orchard.UI.Navigation { /// The current route data. /// Should compare raw string URLs instead of route data. /// A stack with the selection path being the last node the currently selected one. - private static Stack SetSelectedPath(IEnumerable menuItems, HttpRequestBase currentRequest, RouteValueDictionary currentRouteData, bool compareUrls) { + private static Stack GetSelectedPath(IEnumerable menuItems, HttpRequestBase currentRequest, RouteValueDictionary currentRouteData, bool compareUrls) { + var selectedPaths = new List>(); foreach (MenuItem menuItem in menuItems) { - Stack selectedPath = SetSelectedPath(menuItem.Items, currentRequest, currentRouteData, compareUrls); + Stack selectedPath = GetSelectedPath(menuItem.Items, currentRequest, currentRouteData, compareUrls); if (selectedPath != null) { - menuItem.Selected = true; selectedPath.Push(menuItem); - return selectedPath; + if (compareUrls) { + selectedPaths.Add(selectedPath); + } + else { + return selectedPath; + } } // compare route values (if any) first @@ -122,15 +133,19 @@ namespace Orchard.UI.Navigation { } if (match) { - menuItem.Selected = true; - selectedPath = new Stack(); selectedPath.Push(menuItem); - return selectedPath; + + if (compareUrls) { + selectedPaths.Add(selectedPath); + } + else { + return selectedPath; + } } } - return null; + return selectedPaths.OrderByDescending(p => p.First().Href.Split('/').Length).FirstOrDefault(); } /// diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index c25a4d246..2a043ca44 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -3,7 +3,7 @@ - +