[CST-12108] fixed withdrawn & reinstate correction types

4Science · Nov 24, 2023 · 919f1af · 919f1af
1 parent 89b7c22
commit 919f1af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/ReinstateCorrectionType.java b/dspace-api/src/main/java/org/dspace/correctiontype/ReinstateCorrectionType.java
@@ -45,7 +45,8 @@ public class ReinstateCorrectionType implements CorrectionType, InitializingBean
     @Override
     public boolean isAllowed(Context context, Item targetItem) throws SQLException, AuthorizeException {
         authorizeService.authorizeAction(context, targetItem, Constants.READ);
-        return targetItem.isWithdrawn();
+        long tot = qaEventService.countSourcesByTarget(context, targetItem.getID());
+        return tot == 0 && targetItem.isWithdrawn();
     }
 
     @Override

diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/WithdrawnCorrectionType.java b/dspace-api/src/main/java/org/dspace/correctiontype/WithdrawnCorrectionType.java
@@ -45,7 +45,8 @@ public class WithdrawnCorrectionType implements CorrectionType, InitializingBean
     @Override
     public boolean isAllowed(Context context, Item targetItem) throws AuthorizeException, SQLException {
         authorizeService.authorizeAction(context, targetItem, READ);
-        return targetItem.isArchived() && !targetItem.isWithdrawn();
+        long tot = qaEventService.countSourcesByTarget(context, targetItem.getID());
+        return tot == 0 && targetItem.isArchived() && !targetItem.isWithdrawn();
     }
 
     @Override