From b2374829ea2ac02a7bdf04e94e2f12fbbd0776db Mon Sep 17 00:00:00 2001 From: Kevin Van de Velde Date: Mon, 12 Sep 2011 09:16:59 +0000 Subject: [PATCH] [DS-1016] Ensured consistent parameter naming in the configurable workflow. git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6684 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- .../xmlworkflow/AbstractXMLUIAction.java | 2 +- .../xmlui/aspect/xmlworkflow/Submissions.java | 20 +++++++++---------- .../xmlworkflow/WorkflowTransformer.java | 6 +++--- .../aspects/XMLWorkflow/sitemap.xmap | 6 +++--- .../aspects/XMLWorkflow/xmlworkflow.js | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/AbstractXMLUIAction.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/AbstractXMLUIAction.java index a5d964b74b..b58b1dbb91 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/AbstractXMLUIAction.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/AbstractXMLUIAction.java @@ -73,7 +73,7 @@ public abstract class AbstractXMLUIAction extends AbstractDSpaceTransformer impl public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters) throws ProcessingException, SAXException, IOException { super.setup(resolver, objectModel, src, parameters); - int id = parameters.getParameterAsInteger("workflow_item_id", -1); + int id = parameters.getParameterAsInteger("workflowID", -1); try { workflowItem = XmlWorkflowItem.find(context, id); } catch (SQLException e) { diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Submissions.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Submissions.java index 4eaf99dde0..8677590e9a 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Submissions.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Submissions.java @@ -164,15 +164,15 @@ public class Submissions extends AbstractDSpaceTransformer for (ClaimedTask owned : ownedItems) { int workflowItemID = owned.getWorkflowItemID(); - String step_id = owned.getStepID(); - String action_id = owned.getActionID(); + String stepID = owned.getStepID(); + String actionID = owned.getActionID(); XmlWorkflowItem item = null; try { item = XmlWorkflowItem.find(context, workflowItemID); Workflow wf = WorkflowFactory.getWorkflow(item.getCollection()); - Step step = wf.getStep(step_id); - WorkflowActionConfig action = step.getActionConfig(action_id); - String url = contextPath+"/handle/"+item.getCollection().getHandle()+"/xmlworkflow?workflowID="+workflowItemID+"&stepID="+step_id+"&actionID="+action_id; + Step step = wf.getStep(stepID); + WorkflowActionConfig action = step.getActionConfig(actionID); + String url = contextPath+"/handle/"+item.getCollection().getHandle()+"/xmlworkflow?workflowID="+workflowItemID+"&stepID="+stepID+"&actionID="+actionID; DCValue[] titles = item.getItem().getDC("title", null, Item.ANY); String collectionName = item.getCollection().getMetadata("name"); EPerson submitter = item.getSubmitter(); @@ -197,7 +197,7 @@ public class Submissions extends AbstractDSpaceTransformer } // The task description - row.addCell().addXref(url,message("xmlui.XMLWorkflow." + wf.getID() + "." + step_id + "." + action_id)); + row.addCell().addXref(url,message("xmlui.XMLWorkflow." + wf.getID() + "." + stepID + "." + actionID)); // The item description if (titles != null && titles.length > 0) @@ -258,14 +258,14 @@ public class Submissions extends AbstractDSpaceTransformer for (PoolTask pooled : pooledItems) { - String step_id = pooled.getStepID(); + String stepID = pooled.getStepID(); int workflowItemID = pooled.getWorkflowItemID(); - String action_id = pooled.getActionID(); + String actionID = pooled.getActionID(); XmlWorkflowItem item; try { item = XmlWorkflowItem.find(context, workflowItemID); Workflow wf = WorkflowFactory.getWorkflow(item.getCollection()); - String url = contextPath+"/handle/"+item.getCollection().getHandle()+"/xmlworkflow?workflowID="+workflowItemID+"&stepID="+step_id+"&actionID="+action_id; + String url = contextPath+"/handle/"+item.getCollection().getHandle()+"/xmlworkflow?workflowID="+workflowItemID+"&stepID="+stepID+"&actionID="+actionID; DCValue[] titles = item.getItem().getDC("title", null, Item.ANY); String collectionName = item.getCollection().getMetadata("name"); EPerson submitter = item.getSubmitter(); @@ -283,7 +283,7 @@ public class Submissions extends AbstractDSpaceTransformer // The task description // row.addCell().addXref(url,message("xmlui.Submission.Submissions.claimAction")); - row.addCell().addXref(url,message("xmlui.XMLWorkflow." + wf.getID() + "." + step_id + "." + action_id)); + row.addCell().addXref(url,message("xmlui.XMLWorkflow." + wf.getID() + "." + stepID + "." + actionID)); // The item description if (titles != null && titles.length > 0) diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/WorkflowTransformer.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/WorkflowTransformer.java index 7b98bd2113..1da6451b29 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/WorkflowTransformer.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/WorkflowTransformer.java @@ -54,9 +54,9 @@ public class WorkflowTransformer extends AbstractDSpaceTransformer { super.setup(resolver, objectModel, src, parameters); authorized = true; try { - String stepID = parameters.getParameter("step_id"); - String actionID = parameters.getParameter("action_id"); - int workflowID = parameters.getParameterAsInteger("workflow_item_id"); + String stepID = parameters.getParameter("stepID"); + String actionID = parameters.getParameter("actionID"); + int workflowID = parameters.getParameterAsInteger("workflowID"); XmlWorkflowItem wfi = XmlWorkflowItem.find(context, workflowID); Workflow wf = WorkflowFactory.getWorkflow(wfi.getCollection()); diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/sitemap.xmap b/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/sitemap.xmap index 21d3d24483..b2a5b052a3 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/sitemap.xmap +++ b/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/sitemap.xmap @@ -152,9 +152,9 @@ --> - - - + + + diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/xmlworkflow.js b/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/xmlworkflow.js index 347e2b76df..b706add0e7 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/xmlworkflow.js +++ b/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/xmlworkflow.js @@ -128,7 +128,7 @@ function doWorkflow() do{ - sendPageAndWait("handle/"+handle+"/xmlworkflow/getTask",{"workflow_item_id":workflowItemId,"step_id":step.getId(),"action_id":action.getId()}); + sendPageAndWait("handle/"+handle+"/xmlworkflow/getTask",{"workflowID":workflowItemId,"stepID":step.getId(),"actionID":action.getId()}); if (cocoon.request.get("submit_edit")) {