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

#20834 : Fix Workflows transition endpoints localization issue.

Browse Source 
Work Item: 20834
This commit is contained in:
Codinlab
2014-07-28 15:51:55 +02:00
committed by Nicholas Mayne
parent 8e6a7486ce
commit 12d3eb66dc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows.js
View File

@@ -1,4 +1,4 @@
 var connectorPaintStyle = {
var connectorPaintStyle = {
lineWidth: 2,
strokeStyle: "#999",
joinstyle: "round",
@@ -155,12 +155,12 @@
for (i = 0; i < outcomes.length; i++) {
var ep = jsPlumb.addEndpoint(dom, {
anchor: "Continuous",
connectorOverlays: [["Label", { label: outcomes[i], cssClass: "connection-label" }]],
connectorOverlays: [["Label", { label: outcomes[i].label, cssClass: "connection-label" }]],
},
sourceEndpointOptions);
elt.endpoints[outcomes[i]] = ep;
ep.outcome = outcomes[i];
elt.endpoints[outcomes[i].value] = ep;
ep.outcome = outcomes[i].value;
// ep.overlays[0].setLabel(outcomes[i]);
}

4
src/Orchard.Web/Modules/Orchard.Workflows/Views/ActivityToolbox.cshtml
View File

@@ -1,4 +1,4 @@
@using Orchard.Utility.Extensions
@using Orchard.Utility.Extensions
@using Orchard.Workflows.Models
@using Orchard.Workflows.Services
@@ -27,7 +27,7 @@
//<![CDATA[
var activities = { @foreach (var activity in allActivities) { <text>
'@activity.Name': {
outcomes: [@Html.Raw(String.Join(",", activity.GetPossibleOutcomes(new WorkflowContext(), new ActivityContext()).Where(x => !String.IsNullOrEmpty(x.Text)).Select(x => "'" + HttpUtility.JavaScriptStringEncode(x.Text) + "'").ToArray()))],
outcomes: [@Html.Raw(String.Join(",", activity.GetPossibleOutcomes(new WorkflowContext(), new ActivityContext()).Where(x => !String.IsNullOrEmpty(x.Text)).Select(x => "{label:'" + HttpUtility.JavaScriptStringEncode(x.Text) + "', value:'" + HttpUtility.JavaScriptStringEncode(x.TextHint) + "'}").ToArray()))],
category: '@HttpUtility.JavaScriptStringEncode(activity.Category.Text)',
description: '@HttpUtility.JavaScriptStringEncode(activity.Description.Text)',
IsEvent: @(activity.IsEvent ? "true" : "false"),