diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index 948937adb5..c59654d1cf 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -1023,6 +1023,17 @@ class="org.alfresco.repo.web.scripts.workflow.WorkflowInstanceDelete" parent="abstractWorkflowWebScript"> + + + + + + + + + diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java b/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java index 2fad449290..c666fe49a3 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java @@ -218,15 +218,14 @@ public abstract class AbstractWorkflowWebscript extends DeclarativeWebScript /** * Builds the results model, applying pagination to the results if necessary. - * - * @param modelBuilder WorkflowModelBuilder instance to use * @param req The WebScript request * @param dataPropertyName The name of the property to use in the model * @param results The full set of results + * * @return List of results to return to the callee */ - protected Map createResultModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, - String dataPropertyName, List> results) + protected Map createResultModel(WebScriptRequest req, String dataPropertyName, + List> results) { int totalItems = results.size(); int maxItems = getIntParameter(req, PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS); diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java b/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java index 12b351ee60..724167962d 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java @@ -170,7 +170,7 @@ public class TaskInstancesGet extends AbstractWorkflowWebscript } // create and return results, paginated if necessary - return createResultModel(modelBuilder, req, "taskInstances", results); + return createResultModel(req, "taskInstances", results); } /** diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java index f7e1e6bd30..065f353789 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java @@ -148,7 +148,7 @@ public class WorkflowInstancesGet extends AbstractWorkflowWebscript } // create and return results, paginated if necessary - return createResultModel(modelBuilder, req, "workflowInstances", results); + return createResultModel(req, "workflowInstances", results); } /**