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

#19819: Fixing exception thrown in UserTaskEditor

Browse Source 
Work Item: 19819

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-06-26 13:19:54 -07:00
parent 13118e38a1
commit 455d66b036
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Orchard.Web/Modules/Orchard.Workflows/Drivers/UserTaskDriver.cs
View File

@@ -44,6 +44,10 @@ namespace Orchard.Workflows.Drivers {
protected override DriverResult Editor(ContentPart part, dynamic shapeHelper) {
var results = new List<DriverResult> {
ContentShape("UserTask_ActionButton", () => {
if (part.ContentItem.Record == null) {
return null;
}
var workContext = _workContextAccessor.GetContext();
var user = workContext.CurrentUser;
@@ -54,8 +58,6 @@ namespace Orchard.Workflows.Drivers {
})
};
//if (part.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable) {}
return Combined(results.ToArray());
}
@@ -100,22 +102,5 @@ namespace Orchard.Workflows.Drivers {
return Editor(part, shapeHelper);
}
//protected override DriverResult Display(ContentPart part, string displayType, dynamic shapeHelper) {
// return ContentShape("Parts_UserTask_SummaryAdmin", () => {
// var workContext = _workContextAccessor.GetContext();
// var user = workContext.CurrentUser;
// var awaiting = _awaitingActivityRepository.Table.Where(x => x.ContentItemRecord == part.ContentItem.Record && x.ActivityRecord.Name == "UserTask").ToList();
// awaiting = awaiting.Where(x => {
// var state = FormParametersHelper.FromJsonString(x.ActivityRecord.State);
// string rolesState = state.Roles ?? "";
// var roles = rolesState.Split(',');
// return UserTaskActivity.UserIsInRole(user, roles);
// }).ToList();
// return shapeHelper.Parts_Workflow_SummaryAdmin().Activities(awaiting.Select(x => x.ActivityRecord));
// });
//}
}
}