Fix of study validation cycle when there is no inDraft state (reviewer is null).

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / som / StudyRights.java

diff --git a/Workspace/Siman-Common/src/org/splat/som/StudyRights.java b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java
index 049f88f9835e5e0ea34caab8560864e6ef68b01f..8782dab987bea5869b1380af0bc4f6c62b897cee 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/som/StudyRights.java
+++ b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java
@@ -280,15 +280,15 @@ public class StudyRights {
         */
        public boolean canReview() {
                User reviewer = _cycle.getActor(ValidationStep.REVIEW); // May be null if not reviewable
+               boolean res = false;
 
-               if (!_user.equals(reviewer)) {
-                       return false;
-               }
-               if (_operand.getProgressState() != ProgressState.inDRAFT) {
-                       return false;
+               if (((reviewer == null) && ((_operand.getProgressState() == ProgressState.inWORK) || (_operand
+                               .getProgressState() == ProgressState.inDRAFT)))
+                               || (_user.equals(reviewer) && (_operand.getProgressState() == ProgressState.inDRAFT))) {
+                       res = getStudyService().canBeReviewed(_operand);
                }
 
-               return getStudyService().canBeReviewed(_operand);
+               return res;
        }
 
        // ==============================================================================================================================