fix edit group

Author: deedee

src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp

@@ -44,7 +44,7 @@
             <td><span id="ralEndDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
         </tr>
 		<tr class="rGroups">
-			<th>Challenge Groups :</th>
+			<th>Group(s) :</th>
 			<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 		</tr>
 	</table>

src/web/WEB-INF/includes/launch/reviewSoftware.jsp

@@ -62,7 +62,7 @@
             <td><span id="rswCheckpointDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
         </tr>
         <tr class="rGroups">
-            <th>Challenge Groups :</th>
+            <th>Group(s) :</th>
             <td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
         </tr>
 	</table>

src/web/scripts/launch/contestDetailSoftware.js

@@ -1366,7 +1366,17 @@ function populateTypeSection() {
 
 
     }
+    jQuery_1_11_1("#groups").magicSuggest().setValue(mainWidget.softwareCompetition.groups);
+    var groupMap = {};
+    $.each(securityGroups, function(i, val){
+        groupMap[''+val.id]=val.name;
+    });
+    var selectedGroupName = [];
+    $.each(mainWidget.softwareCompetition.groups, function(i, val){
+        selectedGroupName.push(groupMap[val]);
+    });
 
+    $('#rswGroups').html(selectedGroupName.join(", "));
 }
 
 /**
@@ -1422,6 +1432,7 @@ function saveTypeSection() {
             dataType: 'json',
             success: function (jsonResult) {
                 handleSaveAsDraftContestResult(jsonResult);
+                mainWidget.softwareCompetition.groups = jQuery_1_11_1("#groups").magicSuggest().getValue();
                 populateTypeSection();
                 populateRoundSection();
                 if (mainWidget.competitionType == "SOFTWARE") {
@@ -2596,8 +2607,6 @@ function populateSpecSection(initFlag) {
         $("#swThurgoodDiv input").removeAttr("checked");
     }
 
-    jQuery_1_11_1("#groups").magicSuggest().setValue(mainWidget.softwareCompetition.groups);
-
   // for studio
   if (mainWidget.competitionType == "STUDIO") {
 	  $('#contestIntroduction').val(mainWidget.softwareCompetition.projectHeader.projectStudioSpecification.contestIntroduction);
@@ -2652,16 +2661,6 @@ function populateSpecSection(initFlag) {
      });
      $('#rswTechnologies').html(html);
   }
-    var groupMap = {};
-    $.each(securityGroups, function(i, val){
-        groupMap[''+val.id]=val.name;
-    });
-    var selectedGroupName = [];
-    $.each(mainWidget.softwareCompetition.groups, function(i, val){
-        selectedGroupName.push(groupMap[val]);
-    });
-
-    $('#rswGroups').html(selectedGroupName.join(", "));
 
   if(isPlatformContest()) {
       var html = "";