lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-24 18:25:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.10.x' into dev

Browse Source
This commit is contained in:
Sebastien Ros
2017-01-03 15:38:58 -08:00
parent 804255cc09 4f57ecb487
commit e49faa7cff
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ClickToBuild.cmd
View File

@@ -17,6 +17,17 @@ FOR %%b in (
) )
) )
FOR %%b in (
"%VS140COMNTOOLS%\vsvars32.bat"
"%VS120COMNTOOLS%\vsvars32.bat"
"%VS110COMNTOOLS%\vsvars32.bat"
) do (
if exist %%b (
call %%b
goto build
)
)
echo "Unable to detect suitable environment. Build may not succeed." echo "Unable to detect suitable environment. Build may not succeed."
:build :build

3
src/Orchard.Tests.Modules/Recipes/RecipeHandlers/RecipeExecutionStepHandlerTest.cs
View File

@@ -17,8 +17,9 @@ namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
builder.RegisterType<RecipeExecutionLogger>().AsSelf(); builder.RegisterType<RecipeExecutionLogger>().AsSelf();
builder.RegisterType<StubRecipeExecutionStep>().As<IRecipeExecutionStep>().AsSelf().SingleInstance(); builder.RegisterType<StubRecipeExecutionStep>().As<IRecipeExecutionStep>().AsSelf().SingleInstance();
builder.RegisterType<RecipeExecutionStepHandler>().SingleInstance(); builder.RegisterType<RecipeExecutionStepHandler>().SingleInstance();
builder.RegisterType<RecipeExecutionStepResolver>().As<IRecipeExecutionStepResolver>().SingleInstance();
_container = builder.Build(); _container = builder.Build();
} }
[Test] [Test]

2
src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
View File

@@ -303,7 +303,7 @@ namespace Orchard.Lists.Controllers {
[HttpPost] [HttpPost]
public ActionResult Insert(int containerId, int itemId, PagerParameters pagerParameters) { public ActionResult Insert(int containerId, int itemId, PagerParameters pagerParameters) {
var container = _containerService.Get(containerId, VersionOptions.Latest); var container = _containerService.Get(containerId, VersionOptions.Latest);
var item = _contentManager.Get(itemId, VersionOptions.Latest, QueryHints.Empty.ExpandParts<CommonPart, ContainablePart>()); var item = _contentManager.Get(itemId, VersionOptions.Latest, new QueryHints().ExpandParts<CommonPart, ContainablePart>());
var commonPart = item.As<CommonPart>(); var commonPart = item.As<CommonPart>();
var previousItemContainer = commonPart.Container; var previousItemContainer = commonPart.Container;
var itemMetadata = _contentManager.GetItemMetadata(item); var itemMetadata = _contentManager.GetItemMetadata(item);

3
src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
using Orchard.DisplayManagement.Shapes; using Orchard.DisplayManagement.Shapes;
using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Descriptors;
using Orchard.Utility.Extensions;
namespace Orchard.ContentManagement.Drivers { namespace Orchard.ContentManagement.Drivers {
public class ContentShapeResult : DriverResult { public class ContentShapeResult : DriverResult {
@@ -109,7 +110,7 @@ namespace Orchard.ContentManagement.Drivers {
} }
public ContentShapeResult OnGroup(string groupId) { public ContentShapeResult OnGroup(string groupId) {
_groupId = groupId; _groupId = groupId.ToSafeName();
return this; return this;
} }