lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#20239: Worflow local state

Browse Source 
Work Item: 20239
This commit is contained in:
Sebastien Ros
2013-10-25 15:45:17 -07:00
parent 323daf641f
commit 673ef2c0a5
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Workflows/Controllers/AdminController.cs
View File

@@ -1,6 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq; using System.Linq;
using System.Security.Cryptography.X509Certificates;
using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing; using System.Web.Routing;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -381,7 +383,7 @@ namespace Orchard.Workflows.Controllers {
var model = new UpdatedActivityModel { var model = new UpdatedActivityModel {
ClientId = clientId, ClientId = clientId,
Data = new NameValueCollection(formValues) Data = HttpUtility.JavaScriptStringEncode(FormParametersHelper.ToJsonString(formValues))
}; };
TempData["UpdatedViewModel"] = model; TempData["UpdatedViewModel"] = model;

2
src/Orchard.Web/Modules/Orchard.Workflows/ViewModels/AdminEditViewModel.cs
View File

@@ -15,7 +15,7 @@ namespace Orchard.Workflows.ViewModels {
public class UpdatedActivityModel { public class UpdatedActivityModel {
public string ClientId { get; set; } public string ClientId { get; set; }
public NameValueCollection Data { get; set; } public string Data { get; set; }
} }
} }

2
src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml
View File

@@ -52,7 +52,7 @@
var model = TempData["UpdatedViewModel"] as UpdatedActivityModel; var model = TempData["UpdatedViewModel"] as UpdatedActivityModel;
if (model != null) { if (model != null) {
@: updatedActivityClientId = '@(model.ClientId)'; @: updatedActivityClientId = '@(model.ClientId)';
@: updatedActivityState = '@Html.Raw(HttpUtility.JavaScriptStringEncode(FormParametersHelper.ToJsonString(model.Data)))'; @: updatedActivityState = '@Html.Raw(model.Data)';
} }
} }
else if (!Model.IsLocal) { else if (!Model.IsLocal) {