Merge pull request #258 from topcoder-platform/dev-maven

dev-maven to master-maven

Author: dedywahyudi

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.SubmissionNotActive", 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/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.

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.com/?retUrl=https://software.topcoder.com/review";
 
@@ -55,7 +44,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>