Attempt to hide deleted uploads

Author: jmgasper

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

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