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

Fixing NRE

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : c71fcf601e5fdb086734fa320d408bf90fb1acb1
This commit is contained in:
Sebastien Ros
2013-01-30 18:16:58 -08:00
parent a49227d4bd
commit 436e7c3559
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Orchard.Web/Modules/Orchard.Workflows/Activities/UserTaskActivity.cs
View File

@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Roles.Models;
using Orchard.Roles.Services;
using Orchard.Security;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
@@ -9,9 +12,13 @@ using Orchard.Workflows.Services;
namespace Orchard.Workflows.Activities {
public class UserTaskActivity : Event {
private readonly IWorkContextAccessor _workContextAccessor;
private readonly IRoleService _roleService;
public UserTaskActivity(IWorkContextAccessor workContextAccessor) {
public UserTaskActivity(
IWorkContextAccessor workContextAccessor,
IRoleService roleService) {
_workContextAccessor = workContextAccessor;
_roleService = roleService;
T = NullLocalizer.Instance;
}
@@ -34,18 +41,18 @@ namespace Orchard.Workflows.Activities {
}
public override IEnumerable<LocalizedString> GetPossibleOutcomes(WorkflowContext workflowContext, ActivityContext activityContext) {
foreach (var action in GetActions(workflowContext)) {
foreach (var action in GetActions(activityContext)) {
yield return T(action);
}
}
public override bool CanExecute(WorkflowContext workflowContext, ActivityContext activityContext) {
return ActionIsValid(workflowContext) && UserIsInRole(activityContext);
return ActionIsValid(workflowContext, activityContext) && UserIsInRole(activityContext);
}
public override IEnumerable<LocalizedString> Execute(WorkflowContext workflowContext, ActivityContext activityContext) {
if (ActionIsValid(workflowContext) && UserIsInRole(activityContext)) {
if (ActionIsValid(workflowContext, activityContext) && UserIsInRole(activityContext)) {
yield return T(workflowContext.Tokens["UserTask.Action"].ToString());
}
}
@@ -67,10 +74,9 @@ namespace Orchard.Workflows.Activities {
isInRole = roles.Contains("Anonymous");
}
else {
dynamic dynUser = user.ContentItem;
if (dynUser.UserRolesPart != null) {
IEnumerable<string> userRoles = dynUser.UserRolesPart.Roles;
if (user.ContentItem.Has(typeof(UserRolesPart))) {
IEnumerable<string> userRoles = user.ContentItem.As<UserRolesPart>().Roles;
isInRole = userRoles.Any(roles.Contains);
}
}
@@ -78,14 +84,14 @@ namespace Orchard.Workflows.Activities {
return isInRole;
}
private bool ActionIsValid(WorkflowContext context) {
private bool ActionIsValid(WorkflowContext workflowContext, ActivityContext activityContext) {
// checking if user has triggered an accepted action
// triggered action
var userAction = context.Tokens["UserTask.Action"];
var userAction = workflowContext.Tokens["UserTask.Action"];
var actions = GetActions(context);
var actions = GetActions(activityContext);
bool isValidAction = actions.Contains(userAction);
return isValidAction;
@@ -102,7 +108,7 @@ namespace Orchard.Workflows.Activities {
return roles.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
}
private IEnumerable<string> GetActions(WorkflowContext context) {
private IEnumerable<string> GetActions(ActivityContext context) {
string actions = context.GetState<string>("Actions");

4
src/Orchard.Web/Modules/Orchard.Workflows/Models/ActivityContext.cs
View File

@@ -9,6 +9,10 @@ namespace Orchard.Workflows.Models {
public Lazy<dynamic> State { private get; set; }
public T GetState<T>(string key) {
if (State == null || State.Value == null) {
return default(T);
}
return State.Value[key];
}
}

4
src/Orchard.Web/Modules/Orchard.Workflows/Models/WorkflowContext.cs
View File

@@ -35,6 +35,10 @@ namespace Orchard.Workflows.Models {
}
public T GetState<T>(string key) {
if (State == null) {
return default(T);
}
return (T)State[key];
}

2
src/Orchard.Web/Modules/Orchard.Workflows/Services/WorkflowManager.cs
View File

@@ -143,7 +143,7 @@ namespace Orchard.Workflows.Services {
// workflow halted, create a workflow state
var workflow = new WorkflowRecord {
WorkflowDefinitionRecord = workflowContext.Record.WorkflowDefinitionRecord,
WorkflowDefinitionRecord = activityRecord.WorkflowDefinitionRecord,
State = FormParametersHelper.ToJsonString("{}")
};

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

@@ -27,7 +27,7 @@
//<![CDATA[
var activities = { @foreach (var activity in allActivities) { <text>
'@activity.Name': {
outcomes: [@Html.Raw(String.Join(",", activity.GetPossibleOutcomes(new WorkflowContext()).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 => "'" + HttpUtility.JavaScriptStringEncode(x.Text) + "'").ToArray()))],
category: '@HttpUtility.JavaScriptStringEncode(activity.Category.Text)',
description: '@HttpUtility.JavaScriptStringEncode(activity.Description.Text)',
IsEvent: @(activity.IsEvent ? "true" : "false"),