hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-1016] Ensured consistent parameter naming in the configurable workflow.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6684 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Kevin Van de Velde
2011-09-12 09:16:59 +00:00
parent cb74a0c8ef
commit b2374829ea
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/AbstractXMLUIAction.java
View File

@@ -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 { public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters) throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, parameters); super.setup(resolver, objectModel, src, parameters);
int id = parameters.getParameterAsInteger("workflow_item_id", -1); int id = parameters.getParameterAsInteger("workflowID", -1);
try { try {
workflowItem = XmlWorkflowItem.find(context, id); workflowItem = XmlWorkflowItem.find(context, id);
} catch (SQLException e) { } catch (SQLException e) {

20
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Submissions.java
View File

@@ -164,15 +164,15 @@ public class Submissions extends AbstractDSpaceTransformer
for (ClaimedTask owned : ownedItems) for (ClaimedTask owned : ownedItems)
{ {
int workflowItemID = owned.getWorkflowItemID(); int workflowItemID = owned.getWorkflowItemID();
String step_id = owned.getStepID(); String stepID = owned.getStepID();
String action_id = owned.getActionID(); String actionID = owned.getActionID();
XmlWorkflowItem item = null; XmlWorkflowItem item = null;
try { try {
item = XmlWorkflowItem.find(context, workflowItemID); item = XmlWorkflowItem.find(context, workflowItemID);
Workflow wf = WorkflowFactory.getWorkflow(item.getCollection()); Workflow wf = WorkflowFactory.getWorkflow(item.getCollection());
Step step = wf.getStep(step_id); Step step = wf.getStep(stepID);
WorkflowActionConfig action = step.getActionConfig(action_id); WorkflowActionConfig action = step.getActionConfig(actionID);
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); DCValue[] titles = item.getItem().getDC("title", null, Item.ANY);
String collectionName = item.getCollection().getMetadata("name"); String collectionName = item.getCollection().getMetadata("name");
EPerson submitter = item.getSubmitter(); EPerson submitter = item.getSubmitter();
@@ -197,7 +197,7 @@ public class Submissions extends AbstractDSpaceTransformer
} }
// The task description // 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 // The item description
if (titles != null && titles.length > 0) if (titles != null && titles.length > 0)
@@ -258,14 +258,14 @@ public class Submissions extends AbstractDSpaceTransformer
for (PoolTask pooled : pooledItems) for (PoolTask pooled : pooledItems)
{ {
String step_id = pooled.getStepID(); String stepID = pooled.getStepID();
int workflowItemID = pooled.getWorkflowItemID(); int workflowItemID = pooled.getWorkflowItemID();
String action_id = pooled.getActionID(); String actionID = pooled.getActionID();
XmlWorkflowItem item; XmlWorkflowItem item;
try { try {
item = XmlWorkflowItem.find(context, workflowItemID); item = XmlWorkflowItem.find(context, workflowItemID);
Workflow wf = WorkflowFactory.getWorkflow(item.getCollection()); 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); DCValue[] titles = item.getItem().getDC("title", null, Item.ANY);
String collectionName = item.getCollection().getMetadata("name"); String collectionName = item.getCollection().getMetadata("name");
EPerson submitter = item.getSubmitter(); EPerson submitter = item.getSubmitter();
@@ -283,7 +283,7 @@ public class Submissions extends AbstractDSpaceTransformer
// The task description // The task description
// row.addCell().addXref(url,message("xmlui.Submission.Submissions.claimAction")); // 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 // The item description
if (titles != null && titles.length > 0) if (titles != null && titles.length > 0)

6
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/WorkflowTransformer.java
View File

@@ -54,9 +54,9 @@ public class WorkflowTransformer extends AbstractDSpaceTransformer {
super.setup(resolver, objectModel, src, parameters); super.setup(resolver, objectModel, src, parameters);
authorized = true; authorized = true;
try { try {
String stepID = parameters.getParameter("step_id"); String stepID = parameters.getParameter("stepID");
String actionID = parameters.getParameter("action_id"); String actionID = parameters.getParameter("actionID");
int workflowID = parameters.getParameterAsInteger("workflow_item_id"); int workflowID = parameters.getParameterAsInteger("workflowID");
XmlWorkflowItem wfi = XmlWorkflowItem.find(context, workflowID); XmlWorkflowItem wfi = XmlWorkflowItem.find(context, workflowID);
Workflow wf = WorkflowFactory.getWorkflow(wfi.getCollection()); Workflow wf = WorkflowFactory.getWorkflow(wfi.getCollection());

6
dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/sitemap.xmap
View File

@@ -152,9 +152,9 @@
--> -->
<map:match pattern="handle/*/*/xmlworkflow/getTask"> <map:match pattern="handle/*/*/xmlworkflow/getTask">
<map:transform type="WorkflowTransformer"> <map:transform type="WorkflowTransformer">
<map:parameter name="workflow_item_id" value="{flow-attribute:workflow_item_id}"/> <map:parameter name="workflowID" value="{flow-attribute:workflowID}"/>
<map:parameter name="step_id" value="{flow-attribute:step_id}"/> <map:parameter name="stepID" value="{flow-attribute:stepID}"/>
<map:parameter name="action_id" value="{flow-attribute:action_id}"/> <map:parameter name="actionID" value="{flow-attribute:actionID}"/>
</map:transform> </map:transform>
</map:match> </map:match>

2
dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/XMLWorkflow/xmlworkflow.js
View File

@@ -128,7 +128,7 @@ function doWorkflow()
do{ 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")) if (cocoon.request.get("submit_edit"))
{ {