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

#20586: Fixing Form Submitted activity

Browse Source 
Work Item: 20586
This commit is contained in:
Sebastien Ros
2014-03-29 10:48:11 -07:00
parent 5171e9089f
commit 9dcb790d27
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.CustomForms/Activities/FormSubmittedActivity.cs
View File

@@ -27,13 +27,13 @@ namespace Orchard.CustomForms.Activities {
return true; return true;
} }
var content = workflowContext.Content; var content = workflowContext.Tokens["CustomForm"] as ContentItem;
if (content == null) { if (content == null) {
return false; return false;
} }
var contentManager = content.ContentItem.ContentManager; var contentManager = content.ContentManager;
var identities = state.Split(',').Select(x => new ContentIdentity(x)); var identities = state.Split(',').Select(x => new ContentIdentity(x));
var customForms = identities.Select(contentManager.ResolveIdentity); var customForms = identities.Select(contentManager.ResolveIdentity);

2
src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
View File

@@ -156,7 +156,7 @@ namespace Orchard.CustomForms.Controllers {
// trigger any workflow // trigger any workflow
_workflowManager.TriggerEvent(FormSubmittedActivity.EventName, contentItem, _workflowManager.TriggerEvent(FormSubmittedActivity.EventName, contentItem,
() => new Dictionary<string, object> { { "Content", contentItem } }); () => new Dictionary<string, object> { { "Content", contentItem} , { "CustomForm", customForm.ContentItem } });
if (customForm.Redirect) { if (customForm.Redirect) {
returnUrl = _tokenizer.Replace(customForm.RedirectUrl, new Dictionary<string, object> { { "Content", contentItem } }); returnUrl = _tokenizer.Replace(customForm.RedirectUrl, new Dictionary<string, object> { { "Content", contentItem } });