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

Fixing that in Workflows localized outcomes were used as identifiers, breaking when a localization package was installed.

Browse Source 
This is a breaking change for localized sites, see 1.10 release notes.
This commit is contained in:
Lombiq
2015-05-20 01:31:15 +02:00
parent 15ccba2b81
commit 2a57a15363
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ var saveLocal = function (localId) {
workflow.Connections.push({ workflow.Connections.push({
SourceId: connection.sourceId, SourceId: connection.sourceId,
TargetId: connection.targetId, TargetId: connection.targetId,
SourceEndpoint: connection.endpoints[0].outcome, SourceEndpoint: connection.endpoints[0].outcome.Id,
//targetEndpoint: connection.targetEndpoint //targetEndpoint: connection.targetEndpoint
}); });
} }

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

@@ -81,7 +81,7 @@
displaySaveMessage(); displaySaveMessage();
} }
}); });
$("#search-box").focus().on("keyup", function (e) { $("#search-box").focus().on("keyup", function (e) {
var text = $(this).val(); var text = $(this).val();
if (text == "") { if (text == "") {
@@ -155,13 +155,13 @@
for (i = 0; i < outcomes.length; i++) { for (i = 0; i < outcomes.length; i++) {
var ep = jsPlumb.addEndpoint(dom, { var ep = jsPlumb.addEndpoint(dom, {
anchor: "Continuous", anchor: "Continuous",
connectorOverlays: [["Label", { label: outcomes[i].label, cssClass: "connection-label" }]], connectorOverlays: [["Label", { label: outcomes[i].Label, cssClass: "connection-label" }]],
}, },
sourceEndpointOptions); sourceEndpointOptions);
elt.endpoints[outcomes[i].value] = ep; elt.endpoints[outcomes[i].Id] = ep;
ep.outcome = outcomes[i].value; ep.outcome = outcomes[i];
// ep.overlays[0].setLabel(outcomes[i]); // ep.overlays[0].setLabel(outcomes[i].Label);
} }
if (activities[name].hasForm) { if (activities[name].hasForm) {

6
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.Models
@using Orchard.Workflows.Services @using Orchard.Workflows.Services
@@ -12,7 +12,7 @@
<!-- List of available activities --> <!-- List of available activities -->
<ul> <ul>
@foreach (var activity in allActivities) { @foreach (var activity in allActivities) {
<li class="activity-toolbox-item toolbox-@(activity.IsEvent ? "event" : "task") toolbox-@activity.Name.HtmlClassify()" data-activity-name="@activity.Name" data-activity-text="@activity.Name.CamelFriendly()" title="@activity.Description"> <li class="activity-toolbox-item toolbox-@(activity.IsEvent ? "event" : "task") toolbox-@activity.Name.HtmlClassify()" data-activity-name="@activity.Name" title="@activity.Description">
<div> <div>
<h2>@activity.Name.CamelFriendly()</h2> <h2>@activity.Name.CamelFriendly()</h2>
<span class="hint">@activity.Description</span> <span class="hint">@activity.Description</span>
@@ -27,7 +27,7 @@
//<![CDATA[ //<![CDATA[
var activities = { @foreach (var activity in allActivities) { <text> var activities = { @foreach (var activity in allActivities) { <text>
'@activity.Name': { '@activity.Name': {
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()))], outcomes: [@Html.Raw(String.Join(",", activity.GetPossibleOutcomes(new WorkflowContext(), new ActivityContext()).Where(x => !String.IsNullOrEmpty(x.Text)).Select(x => "{ Id: '" + HttpUtility.JavaScriptStringEncode(x.TextHint) + "', Label: '" + HttpUtility.JavaScriptStringEncode(x.Text) + "' }").ToArray()))],
category: '@HttpUtility.JavaScriptStringEncode(activity.Category.Text)', category: '@HttpUtility.JavaScriptStringEncode(activity.Category.Text)',
description: '@HttpUtility.JavaScriptStringEncode(activity.Description.Text)', description: '@HttpUtility.JavaScriptStringEncode(activity.Description.Text)',
IsEvent: @(activity.IsEvent ? "true" : "false"), IsEvent: @(activity.IsEvent ? "true" : "false"),