Merge pull request #213 from appirio-tech/dev

Fix reviewer assignment for tasks

Author: ajefts

services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java

@@ -9189,7 +9189,7 @@ public void closeSoftwareContest(TCSubject tcSubject, long projectId, long winne
             for (com.topcoder.management.resource.Resource r : reviewers) {
                 this.projectServices.removeResource(r, String.valueOf(tcSubject.getUserId()));
             }
-            com.topcoder.management.resource.Resource reviewer = createReviewerResource(winnerId, contest.getId(),
+            com.topcoder.management.resource.Resource reviewer = createReviewerResource(tcSubject.getUserId(), contest.getId(),
                     reviewPhase.getId(), false, ProjectCategory.FIRST2FINISH.getName().equals(contest.getProjectCategory().getName()));
 
             reviewer = projectServices.updateResource(reviewer, String.valueOf(tcSubject.getUserId()));
@@ -9238,4 +9238,4 @@ public void cancelSoftwareContestByUser(TCSubject tcSubject, long projectId) thr
             throw new ContestServiceException("Failed to update challenge", e);
         }
     }
-}
+}

src/web/scripts/launch/contestDetailSoftware.js

@@ -3353,7 +3353,7 @@ function doCloseContest(winnerId) {
         success: function (jsonResult) {
             handleJsonResult(jsonResult,
                 function(result) {
-                    showConfirmation("Success", "Challenge has been closed", "OK", function () {
+                    showConfirmation("Success", "The system will close the challenge shortly.", "OK", function () {
                         location.reload();
                     });
                 },
@@ -3428,4 +3428,4 @@ function showSelectWinner(modal, title, yesButtonHandler) {
     $(modal + " .modalCommandBox .noBtn").bind("click", noButtonHandler);
     adjustAndShow(modal);
     $(modal + " #registrants").resetSS();
-}
+}