Merge pull request #251 from topcoder-platform/reskin-or

Reskin OR to DEV

Author: dedywahyudi

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);
                     }
                 }
 

web/includes/inc_header_reskin.jsp

@@ -25,17 +25,6 @@
     o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
     }(window,document,"script",scriptURL,"tcUniNav");
 
-    var userId = `${userId}`;
-    if (userId !== '-1') {
-        var handle = "${userHandle}";
-    }
-    var initials = handle ? handle.substr(0, 2).toUpperCase() : '';
-
-    var user = {
-        userId,
-        initials,
-        handle
-    };
 
     var signInUrl = "https://accounts-auth0.topcoder-dev.com/?retUrl=https://software.topcoder-dev.com/review"
 
@@ -53,7 +42,7 @@
         type: 'tool',
         toolName: 'Review',
         toolRoot: '/',
-        user: handle ? user : null,
+        user: 'auto',
         signOut() {
             window.location.replace(signOutUrl)
         },

web/includes/project/project_phase_reskin.jsp

@@ -1180,9 +1180,9 @@
                                                             <c:choose>
                                                                 <c:when test="${review.committed}">
                                                                     <c:choose>
-                                                                        <c:when test="${isSubmitter and not group.checkpointReviewFinished}">
+                                                                        <%-- <c:when test="${isSubmitter and not group.checkpointReviewFinished}">
                                                                             <or:text key="Pending"/>
-                                                                        </c:when>
+                                                                        </c:when> --%>
                                                                         <c:when test="${isAllowedToViewCheckpointReview}">
                                                                             <a href="<or:url value='/actions/ViewCheckpointReview?rid=${review.id}' />">
                                                                                 ${orfn:displayScore(pageContext.request, review.score)}</a>