Merge pull request #259 from topcoder-platform/fix/iterative-review

Fix/iterative review

Author: eisbilir

src/main/java/com/cronos/onlinereview/actions/projectreview/BaseProjectReviewAction.java

@@ -1021,6 +1021,12 @@ protected String saveGenericReview(DynamicModel reviewForm, HttpServletRequest r
             }
         }
 
+        if (scorecardTypeName.equals("Iterative Review") && !verification.getSubmission().getSubmissionStatus()
+                .getName()
+                .equals(com.topcoder.onlinereview.component.project.phase.handler.Constants.SUBMISSION_STATUS_ACTIVE)) {
+            return ActionsHelper.produceErrorReport(
+                    this, request, permName, "Error.IncorrectPhase", null);
+        }
         // Get "My" resource for the appropriate phase
         Resource myResource = ActionsHelper.getMyResourceForPhase(request, phase);
         // If no resource found for particular phase, try to find resource without phase assigned

src/main/java/com/cronos/onlinereview/util/PhasesDetailsServices.java

@@ -465,22 +465,21 @@ private static Upload[][] getPreviousUploadsForSubmissions(HttpServletRequest re
         Upload[][] pastSubmissions = null;
         if (submissions.length > 0 && AuthorizationHelper.hasUserPermission(request, viewAllSubmissionsPermission)) {
 
-            // Find all undeleted submissions for specified project
-            Submission[] allUnDeletedSubmissions = ActionsHelper.getProjectSubmissions(project.getId(), null, null,
-                    false);
+            // Find all deleted submissions for specified project
+            Submission[] allDeletedSubmissions = ActionsHelper.getProjectSubmissions(project.getId(), null, "Deleted",
+                    true);
 
             pastSubmissions = new Upload[submissions.length][];
 
             for (int j = 0; j < pastSubmissions.length; ++j) {
                 List<Upload> temp = new ArrayList<Upload>();
                 long currentUploadOwnerId = submissions[j].getUpload().getOwner();
 
-                for (Submission unDeletedSubmission : allUnDeletedSubmissions) {
-                    Upload unDeletedSubmissionUpload = unDeletedSubmission.getUpload();
-                    if (unDeletedSubmission.getSubmissionType().getId() == submissions[j].getSubmissionType().getId()
-                    		&& unDeletedSubmission.getId() != submissions[j].getId()
-                            && unDeletedSubmissionUpload.getOwner() == currentUploadOwnerId) {
-                        temp.add(unDeletedSubmissionUpload);
+                for (Submission deletedSubmission : allDeletedSubmissions) {
+                    Upload deletedSubmissionUpload = deletedSubmission.getUpload();
+                    if (deletedSubmission.getSubmissionType().getId() == submissions[j].getSubmissionType().getId()
+                            && deletedSubmissionUpload.getOwner() == currentUploadOwnerId) {
+                        temp.add(deletedSubmissionUpload);
                     }
                 }
 

src/main/resources/MessageResources.properties

@@ -1262,6 +1262,7 @@ Error.NotASubmission=The file you are trying to download is not a submission.
 Error.NotASubmission2=The file you are trying to delete is not a submission. You can delete only submissions by this action.
 Error.NotASubmission3=The file you are trying to advance is not a submission. You can advance only submissions by this action.
 Error.SubmissionDeleted=The submission you are trying to remove has already been deleted.
+Error.SubmissionNotActive=The submission is not active.
 Error.OnlyOneFinalFix=You cannot upload more than one final fix during the same Final Fix phase.
 Error.NotAFinalFix=The file you are trying to download is not a Final Fix.
 Error.NotTestCases=The file you are trying to download is not Test Cases.