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

[DS-2646]: javadoc & SUBMIT_EDIT_METADATA to ProcessingAction

Browse Source
This commit is contained in:
Marie Verdonck
2020-01-31 13:10:42 +01:00
parent 8b51ba692d
commit aaa9d5ed29
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/Action.java
View File

@@ -44,6 +44,10 @@ public abstract class Action {
public abstract ActionResult execute(Context c, XmlWorkflowItem wfi, Step step, HttpServletRequest request) public abstract ActionResult execute(Context c, XmlWorkflowItem wfi, Step step, HttpServletRequest request)
throws SQLException, AuthorizeException, IOException, WorkflowException; throws SQLException, AuthorizeException, IOException, WorkflowException;
/**
* Returns a list of options that the user can select at this action which results in the next step in the workflow
* @return A list of options of this action, resulting in the next step of the workflow
*/
public abstract List<String> getOptions(); public abstract List<String> getOptions();
public WorkflowActionConfig getParent() { public WorkflowActionConfig getParent() {

4
dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/WorkflowActionConfig.java
View File

@@ -61,6 +61,10 @@ public class WorkflowActionConfig {
return step; return step;
} }
/**
* Returns a list of options the user has on this action, resulting in the next step of the workflow
* @return A list of options of this action, resulting in the next step of the workflow
*/
public List<String> getOptions() { public List<String> getOptions() {
return this.processingAction.getOptions(); return this.processingAction.getOptions();
} }

3
dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/AcceptEditRejectAction.java
View File

@@ -35,7 +35,6 @@ public class AcceptEditRejectAction extends ProcessingAction {
private static final String SUBMIT_APPROVE = "submit_approve"; private static final String SUBMIT_APPROVE = "submit_approve";
private static final String SUBMIT_REJECT = "submit_reject"; private static final String SUBMIT_REJECT = "submit_reject";
private static final String SUBMIT_EDIT_METADATA = "submit_edit_metadata";
//TODO: rename to AcceptAndEditMetadataAction //TODO: rename to AcceptAndEditMetadataAction
@@ -63,7 +62,7 @@ public class AcceptEditRejectAction extends ProcessingAction {
List<String> options = new ArrayList<>(); List<String> options = new ArrayList<>();
options.add(SUBMIT_APPROVE); options.add(SUBMIT_APPROVE);
options.add(SUBMIT_REJECT); options.add(SUBMIT_REJECT);
options.add(SUBMIT_EDIT_METADATA); options.add(ProcessingAction.SUBMIT_EDIT_METADATA);
return options; return options;
} }

3
dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/FinalEditAction.java
View File

@@ -33,7 +33,6 @@ import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
public class FinalEditAction extends ProcessingAction { public class FinalEditAction extends ProcessingAction {
private static final String SUBMIT_APPROVE = "submit_approve"; private static final String SUBMIT_APPROVE = "submit_approve";
private static final String SUBMIT_EDIT_METADATA = "submit_edit_metadata";
@Override @Override
public void activate(Context c, XmlWorkflowItem wf) { public void activate(Context c, XmlWorkflowItem wf) {
@@ -63,7 +62,7 @@ public class FinalEditAction extends ProcessingAction {
public List<String> getOptions() { public List<String> getOptions() {
List<String> options = new ArrayList<>(); List<String> options = new ArrayList<>();
options.add(SUBMIT_APPROVE); options.add(SUBMIT_APPROVE);
options.add(SUBMIT_EDIT_METADATA); options.add(ProcessingAction.SUBMIT_EDIT_METADATA);
return options; return options;
} }

1
dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ProcessingAction.java
View File

@@ -34,6 +34,7 @@ public abstract class ProcessingAction extends Action {
@Autowired(required = true) @Autowired(required = true)
protected ItemService itemService; protected ItemService itemService;
protected static final String SUBMIT_EDIT_METADATA = "submit_edit_metadata";
@Override @Override
public boolean isAuthorized(Context context, HttpServletRequest request, XmlWorkflowItem wfi) throws SQLException { public boolean isAuthorized(Context context, HttpServletRequest request, XmlWorkflowItem wfi) throws SQLException {