Merge pull request #237 from skyhit/rename_product_type_property

rename product type property

Author: ajefts

components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java

@@ -46,7 +46,7 @@
  *
  * <p>
  *     Version 1.2.7 (TOPCODER DIRECT - ADD OPTIONAL CHALLENGE PROPERTY - PRODUCT)
- *     - Add property {@link #PRODUCT_TYPE}
+ *     - Add property {@link #PRODUCT_SKU}
  * </p>
  *
  * @author tuenm, iamajia, flytoj2ee, tangzx, GreatKevin, TCSCODER
@@ -372,11 +372,11 @@ public class ProjectPropertyType implements Serializable {
     public static final String PRIVATE_PROJECT = "Private Project Status";
 
     /**
-     *  Represent "Product Type" project property type
+     *  Represent "Product SKU" project property type
      *
      *  @since 1.2.7
      */
-    public static final String PRODUCT_TYPE = "Product Type";
+    public static final String PRODUCT_SKU = "Product SKU";
 
     /**
      * Represents the id of this instance. Only values greater than zero is

src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java

@@ -1045,10 +1045,10 @@ public boolean evaluate(Object object) {
                 }
             }
         }
-        if ((softwareCompetition.getProjectHeader().getProperty(ProjectPropertyType.PRODUCT_TYPE) == null ||
-                "".equals(softwareCompetition.getProjectHeader().getProperty(ProjectPropertyType.PRODUCT_TYPE))) &&
-                softwareCompetition.getProjectHeader().getProperties().containsKey(ProjectPropertyType.PRODUCT_TYPE)){
-            softwareCompetition.getProjectHeader().getProperties().remove(ProjectPropertyType.PRODUCT_TYPE);
+        if ((softwareCompetition.getProjectHeader().getProperty(ProjectPropertyType.PRODUCT_SKU) == null ||
+                "".equals(softwareCompetition.getProjectHeader().getProperty(ProjectPropertyType.PRODUCT_SKU))) &&
+                softwareCompetition.getProjectHeader().getProperties().containsKey(ProjectPropertyType.PRODUCT_SKU)){
+            softwareCompetition.getProjectHeader().getProperties().remove(ProjectPropertyType.PRODUCT_SKU);
         }
     }
 

src/web/scripts/launch/contestDetailSoftware.js

@@ -1223,9 +1223,9 @@ function populateTypeSection() {
 	$('#chkboxCCA').attr('checked', mainWidget.softwareCompetition.projectHeader.isLccchecked());
 
 	//product
-    if (mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE] != null){
-        $("#rProduct").text(mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE]);
-        $("#productName").val(mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE]);
+    if (mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU] != null){
+        $("#rProduct").text(mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU]);
+        $("#productName").val(mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU]);
     }
 	$('#rContestTypeName').text($("#contestTypes option[value=" + mainWidget.competitionType + mainWidget.softwareCompetition.projectHeader.projectCategory.id +"]").text());
 

src/web/scripts/launch/entity.js

@@ -194,7 +194,7 @@ var STUDIO_IDEA_GENERATION = 22;
 var DRAFT_STATUS = "Draft";
 var ACTIVE_STATUS = "Active";
 
-var PRODUCT_TYPE ="Product Type"	;
+var PRODUCT_SKU ="Product SKU";
 
 var projectCategoryArray = [
 	{id:SOFTWARE_CATEGORY_ID_CONCEPT,      name:'CONCEPTUALIZATION',                label:'Software Conceptualization',         typeId:2, typeName:'Application', hasMulti:true,  hideInDropdown: true},

src/web/scripts/launch/main.js

@@ -1041,9 +1041,9 @@ function saveAsDraftRequest() {
     }
 
     if ($("#productName").val().trim().length > 0) {
-        mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE] = $("#productName").val().trim();
+        mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU] = $("#productName").val().trim();
     }else{
-        mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE] = "";
+        mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU] = "";
     }