lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs
This commit is contained in:
Sebastien Ros
2014-06-13 15:50:33 -07:00
parent cce3a0e1ed d0f5454fc1
commit f856da3b02
11 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Drivers/ScriptValidationPartDriver.cs
View File

@@ -35,6 +35,8 @@ namespace Orchard.Scripting.CSharp.Drivers {
if (!String.IsNullOrWhiteSpace(script)) {
script = "// #{ }" + System.Environment.NewLine + script;
_csharpService.SetParameter("Services", _orchardServices);
_csharpService.SetParameter("ContentItem", (dynamic)part.ContentItem);
_csharpService.SetParameter("WorkContext", _workContextAccessor.GetContext());