From 2d1a2d11e784dceacfbe67eb9c0518f386717bd4 Mon Sep 17 00:00:00 2001 From: ajefts Date: Wed, 22 Feb 2017 11:23:45 -0500 Subject: [PATCH 1/7] updated readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 28a6b9518..7a763bd5c 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,9 @@ In this configuration, we'll run the direct app in a docker container locally bu --- +## Test Users + +direct_user/topcoder2001 (Use this user to login to Direct and create challenges in the Topcoder DEV environment. You can alsoo use this user to manipulate challenges in Online Review) ## **old** instructions From 3ef6c34070ef64352180af33a53b43075924c991 Mon Sep 17 00:00:00 2001 From: Guiqiang Zhang Date: Wed, 8 Mar 2017 09:52:30 +0800 Subject: [PATCH 2/7] allow zero prize --- .../contest/launch/SaveDraftContestAction.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java index 04dfeae71..b4045896a 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 - 2016 TopCoder Inc., All Rights Reserved. + * Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved. */ package com.topcoder.direct.services.view.action.contest.launch; @@ -265,8 +265,16 @@ *
  • Updated {@link #executeAction()}
    • * *

    - * @author fabrizyo, FireIce, Veve, isv, GreatKevin, flexme, frozenfx, bugbuka, GreatKevin, Veve - * @version 2.3 + * + *

    + * Version 2.4 (TOPCODER DIRECT - SUPPORT CHALLENGES WITH ZERO PRIZE): + *

    + *

    + * + * @author fabrizyo, FireIce, Veve, isv, GreatKevin, flexme, frozenfx, bugbuka, TCSCODER + * @version 2.4 */ public class SaveDraftContestAction extends ContestAction { /** @@ -964,7 +972,7 @@ public boolean evaluate(Object object) { List newPrizes = new ArrayList(); if (prizes != null) { for (Prize prize : prizes) { - if (prize.getPrizeAmount() > 0) { + if (prize.getPrizeAmount() >= 0) { if (projectId > 0) { prize.setProjectId(projectId); } else { From a0cbec0904d70855d6e19a65cc6ad5e7bc20be81 Mon Sep 17 00:00:00 2001 From: Guiqiang Zhang Date: Thu, 16 Mar 2017 15:20:39 +0800 Subject: [PATCH 3/7] support product challenge property --- .../project/ProjectPropertyType.java | 16 +++++++++++-- docker-compose.yml | 23 ------------------- .../launch/SaveDraftContestAction.java | 5 ++++ src/web/WEB-INF/includes/contest/editTab.jsp | 14 ++++++++++- .../includes/contest/editTabMarathon.jsp | 13 ++++++++++- .../includes/contest/editTabSoftware.jsp | 13 ++++++++++- .../includes/launch/contestSelection.jsp | 6 +++++ .../scripts/launch/contestDetailSoftware.js | 8 +++++-- src/web/scripts/launch/entity.js | 2 ++ src/web/scripts/launch/main.js | 6 +++++ 10 files changed, 76 insertions(+), 30 deletions(-) delete mode 100644 docker-compose.yml diff --git a/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java b/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java index 267736d28..3b4b47355 100644 --- a/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java +++ b/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 - 2016 TopCoder Inc., All Rights Reserved. + * Copyright (C) 2006 - 2017 TopCoder Inc., All Rights Reserved. */ package com.topcoder.management.project; @@ -44,8 +44,13 @@ * - Add property {@link #PRIVATE_PROJECT} *

    * + *

    + * Version 1.2.7 (TOPCODER DIRECT - ADD OPTIONAL CHALLENGE PROPERTY - PRODUCT) + * - Add property {@link #PRODUCT_TYPE} + *

    + * * @author tuenm, iamajia, flytoj2ee, tangzx, GreatKevin, TCSCODER - * @version 1.2.6 + * @version 1.2.7 * @since 1.0 */ public class ProjectPropertyType implements Serializable { @@ -366,6 +371,13 @@ public class ProjectPropertyType implements Serializable { */ public static final String PRIVATE_PROJECT = "Private Project Status"; + /** + * Represent "Product Type" project property type + * + * @since 1.2.7 + */ + public static final String PRODUCT_TYPE = "Product Type"; + /** * Represents the id of this instance. Only values greater than zero is * allowed. This variable is initialized in the constructor and can be diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 6ce41e720..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '2' -services: - tc-informix: - image: "appiriodevops/informix:1.2" - ports: - - "2021:2021" - tc-direct: - build: ./docker/local-setup/direct-app-base - #image: "tc-direct" - #image: "appiriodevops/direct-app-base:latest" - links: - - "tc-informix" - volumes: - - ".:/root/direct" - hostname: cockpit.cloud.topcoder.com - command: sh -c "cd /root/direct && ant first_deploy && /root/jboss-4.2.3.GA/bin/run.sh -b 0.0.0.0 -Djboss.remoting.version=1" - ports: - - "443:443" - - "8180:8180" - - "1199:1199" - - "1198:1198" - - "3973:3973" - diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java index b4045896a..bcea65310 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java @@ -1045,6 +1045,11 @@ 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); + } } /** diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index 759e5a047..048223959 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -96,6 +96,7 @@ Billing Account : + <%-- Private Group @@ -118,6 +119,11 @@ : + + Product + : + + Copilot : @@ -251,7 +257,13 @@ -

    +


    + Product + + + + +


    diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp index 1a4afba3e..6778492f4 100644 --- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp +++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp @@ -87,6 +87,11 @@ : + + Product + : + + Copilot : @@ -206,7 +211,13 @@
    -

    +


    + Product + + + + +


    Copilot diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp index db1553d8b..45d2f7b8a 100644 --- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp +++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp @@ -139,6 +139,11 @@ : + + Product + : + + Copilot : @@ -274,7 +279,13 @@
    - +

    + Product + + + + +

    Copilot diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp index 85aa40eda..8844dd3de 100644 --- a/src/web/WEB-INF/includes/launch/contestSelection.jsp +++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp @@ -158,6 +158,12 @@ Manage Project Milestones
    + +
    + + +
    +
    diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js index 971dfeac2..fa5e73b59 100644 --- a/src/web/scripts/launch/contestDetailSoftware.js +++ b/src/web/scripts/launch/contestDetailSoftware.js @@ -1222,7 +1222,11 @@ function populateTypeSection() { $('#chkboxCCA').attr('checked', mainWidget.softwareCompetition.projectHeader.isLccchecked()); - //display + //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]); + } $('#rContestTypeName').text($("#contestTypes option[value=" + mainWidget.competitionType + mainWidget.softwareCompetition.projectHeader.projectCategory.id +"]").text()); loadReviewScorecardList(null); @@ -1513,7 +1517,7 @@ function validateFieldsTypeSection() { if (categoryId == SOFTWARE_CATEGORY_ID_F2F) { // set review scorecard. mainWidget.softwareCompetition.projectHeader.iterativeReviewScorecardId = parseInt($('select#reviewScorecardSelects').val()); - } else { + } else if (categoryId != ALGORITHM_CATEGORY_ID_MARATHON){ // set iterative review scorecard mainWidget.softwareCompetition.projectHeader.reviewScorecardId = parseInt($('select#reviewScorecardSelects').val()); } diff --git a/src/web/scripts/launch/entity.js b/src/web/scripts/launch/entity.js index 7919bd6b1..8fb005000 100644 --- a/src/web/scripts/launch/entity.js +++ b/src/web/scripts/launch/entity.js @@ -194,6 +194,8 @@ var STUDIO_IDEA_GENERATION = 22; var DRAFT_STATUS = "Draft"; var ACTIVE_STATUS = "Active"; +var PRODUCT_TYPE ="Product Type" ; + var projectCategoryArray = [ {id:SOFTWARE_CATEGORY_ID_CONCEPT, name:'CONCEPTUALIZATION', label:'Software Conceptualization', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, {id:SOFTWARE_CATEGORY_ID_SPEC, name:'SPECIFICATION', label:'Software Specification', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js index 3405c4ba0..b71d4479a 100644 --- a/src/web/scripts/launch/main.js +++ b/src/web/scripts/launch/main.js @@ -1040,6 +1040,12 @@ function saveAsDraftRequest() { mainWidget.softwareCompetition.projectHeader.properties['Review Type'] = reviewType; } + if ($("#productName").val().trim().length > 0) { + mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE] = $("#productName").val().trim(); + }else{ + mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_TYPE] = ""; + } + var request; From fee8a0998e5600a63a0daf7cc4c886b5e0e490de Mon Sep 17 00:00:00 2001 From: Guiqiang Zhang Date: Thu, 16 Mar 2017 16:51:03 +0800 Subject: [PATCH 4/7] allow any characters --- .../com/topcoder/service/project/impl/ProjectServiceBean.java | 4 ---- src/web/scripts/common.js | 3 --- 2 files changed, 7 deletions(-) diff --git a/services/project_service/src/java/main/com/topcoder/service/project/impl/ProjectServiceBean.java b/services/project_service/src/java/main/com/topcoder/service/project/impl/ProjectServiceBean.java index e82233f79..c28ec8cc6 100644 --- a/services/project_service/src/java/main/com/topcoder/service/project/impl/ProjectServiceBean.java +++ b/services/project_service/src/java/main/com/topcoder/service/project/impl/ProjectServiceBean.java @@ -1996,8 +1996,6 @@ private void checkProjectData(ProjectData projectData, boolean isCreate) throws throw logException(new IllegalArgumentFault("The name attribute of the project data can not be null.")); } else if (name.trim().length() == 0) { throw logException(new IllegalArgumentFault("The name attribute of the project data can not be empty.")); - } else if (!Pattern.matches(NAME_PATTERN, name)) { - throw logException(new IllegalArgumentFault("The name attribute of the project data is not following pattern as - " + NAME_PATTERN)); } String description = projectData.getDescription(); @@ -2005,8 +2003,6 @@ private void checkProjectData(ProjectData projectData, boolean isCreate) throws throw logException(new IllegalArgumentFault("The description attribute of the project data can not be null.")); } else if (description.trim().length() == 0) { throw logException(new IllegalArgumentFault("The description attribute of the project data can not be empty.")); - } else if (!Pattern.matches(NAME_PATTERN, description)) { - throw logException(new IllegalArgumentFault("The description attribute of the project data is not following pattern as - " + NAME_PATTERN)); } //added in version 2.2 diff --git a/src/web/scripts/common.js b/src/web/scripts/common.js index 93ae9321e..8c5247d83 100644 --- a/src/web/scripts/common.js +++ b/src/web/scripts/common.js @@ -130,9 +130,6 @@ function limitContestProjectNameChars(maxChars) { var textArea = $(this); var content = textArea.val(); var invalid = false; - if (content.search(invalidCharsRegExp, '') > -1) { - invalid = true; - } if (content.length <= maxChars && !invalid) { ori = content; } From 6c9dc7f2d2a145d3805b80a801a4177e4d6ccfa7 Mon Sep 17 00:00:00 2001 From: Guiqiang Zhang Date: Tue, 28 Mar 2017 08:10:18 +0800 Subject: [PATCH 5/7] hide product row --- src/web/WEB-INF/includes/contest/editTab.jsp | 4 ++++ src/web/WEB-INF/includes/contest/editTabMarathon.jsp | 4 ++++ src/web/WEB-INF/includes/contest/editTabSoftware.jsp | 5 ++++- src/web/WEB-INF/includes/launch/contestSelection.jsp | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index 048223959..d0412a102 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -124,11 +124,13 @@ : +<%-- Copilot : +--%> Task : @@ -258,12 +260,14 @@



    + <%-- Product

    + --%>

    diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp index 6778492f4..51ea087d9 100644 --- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp +++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp @@ -87,11 +87,13 @@ : +<%-- Product : +--%> Copilot : @@ -212,12 +214,14 @@



    +<%-- Product

    +--%>

    Copilot diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp index 45d2f7b8a..60ced1c87 100644 --- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp +++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp @@ -139,11 +139,13 @@ : +<%-- Product : +--%> Copilot : @@ -280,13 +282,14 @@


    + <%-- Product

    - +---%>
    Copilot diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp index 8844dd3de..ec9625523 100644 --- a/src/web/WEB-INF/includes/launch/contestSelection.jsp +++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp @@ -159,11 +159,12 @@
    +<%--
    - +--%>
    From 5e52b965be5c1c450cdc7d7f7b9284e51344d02f Mon Sep 17 00:00:00 2001 From: Guiqiang Zhang Date: Tue, 28 Mar 2017 08:29:12 +0800 Subject: [PATCH 6/7] rename product type property --- .../topcoder/management/project/ProjectPropertyType.java | 6 +++--- .../action/contest/launch/SaveDraftContestAction.java | 8 ++++---- src/web/scripts/launch/contestDetailSoftware.js | 6 +++--- src/web/scripts/launch/entity.js | 2 +- src/web/scripts/launch/main.js | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java b/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java index 3b4b47355..4e2784e41 100644 --- a/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java +++ b/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java @@ -46,7 +46,7 @@ * *

    * Version 1.2.7 (TOPCODER DIRECT - ADD OPTIONAL CHALLENGE PROPERTY - PRODUCT) - * - Add property {@link #PRODUCT_TYPE} + * - Add property {@link #PRODUCT_SKU} *

    * * @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 diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java index bcea65310..b8c0e52b1 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java +++ b/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); } } diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js index fa5e73b59..39d6a1c9b 100644 --- a/src/web/scripts/launch/contestDetailSoftware.js +++ b/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()); diff --git a/src/web/scripts/launch/entity.js b/src/web/scripts/launch/entity.js index 8fb005000..033d344d7 100644 --- a/src/web/scripts/launch/entity.js +++ b/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}, diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js index b71d4479a..a5b8ac183 100644 --- a/src/web/scripts/launch/main.js +++ b/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] = ""; } From 721723e23f4268385f2dbce2de3cf37dd9e0456e Mon Sep 17 00:00:00 2001 From: Guiqiang Zhang Date: Tue, 28 Mar 2017 09:22:20 +0800 Subject: [PATCH 7/7] quick fix --- src/web/WEB-INF/includes/contest/editTab.jsp | 4 ++-- src/web/scripts/launch/contestDetailSoftware.js | 2 ++ src/web/scripts/launch/main.js | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index d0412a102..d401d249b 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -119,18 +119,18 @@ : +<%-- Product : -<%-- +--%> Copilot : ---%> Task : diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js index 39d6a1c9b..9743d2853 100644 --- a/src/web/scripts/launch/contestDetailSoftware.js +++ b/src/web/scripts/launch/contestDetailSoftware.js @@ -1223,10 +1223,12 @@ function populateTypeSection() { $('#chkboxCCA').attr('checked', mainWidget.softwareCompetition.projectHeader.isLccchecked()); //product + /* 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()); loadReviewScorecardList(null); diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js index a5b8ac183..e0dc614e3 100644 --- a/src/web/scripts/launch/main.js +++ b/src/web/scripts/launch/main.js @@ -1039,13 +1039,13 @@ function saveAsDraftRequest() { mainWidget.softwareCompetition.projectHeader.properties['Review Type'] = reviewType; } - +/* if ($("#productName").val().trim().length > 0) { mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU] = $("#productName").val().trim(); }else{ mainWidget.softwareCompetition.projectHeader.properties[PRODUCT_SKU] = ""; } - +*/ var request;