|
426 | 426 | * <ul>
|
427 | 427 | * <li>updated on {@link #createProjectWithTemplate(Project, com.topcoder.project.phases.Project, Resource[], Date, Date, String)}</li>
|
428 | 428 | * <li>updated on {@link #updateProject(Project, String, com.topcoder.project.phases.Project, Resource[], Date, Date, String)}</li>
|
429 |
| - * <li>added {@link #checkPrivateProjectPhase(Project, com.topcoder.project.phases.Project)}</li> |
430 | 429 | * </ul>
|
431 | 430 | * <p>
|
432 | 431 | *
|
@@ -2080,10 +2079,21 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
|
2080 | 2079 | // code with auto assigned review only requires one reviewer.
|
2081 | 2080 | p.setAttribute("Reviewer Number", "2");
|
2082 | 2081 | }
|
| 2082 | + |
| 2083 | + if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId() && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) { |
| 2084 | + if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) { |
| 2085 | + if (p.getPhaseStatus().getId() != PhaseStatus.CLOSED.getId()) { |
| 2086 | + p.setPhaseStatus(PhaseStatus.CLOSED); |
| 2087 | + } |
| 2088 | + } else { |
| 2089 | + if (p.getPhaseStatus().getId() == PhaseStatus.CLOSED.getId()) { |
| 2090 | + p.setPhaseStatus(PhaseStatus.SCHEDULED); |
| 2091 | + } |
| 2092 | + } |
| 2093 | + } |
2083 | 2094 | }
|
2084 | 2095 | }
|
2085 | 2096 |
|
2086 |
| - checkPrivateProjectPhase(projectHeader, projectPhases); |
2087 | 2097 | setScorecards(projectHeader, projectPhases);
|
2088 | 2098 | // call phaseManager.updatePhases(projectPhases,operator)
|
2089 | 2099 | Util.log(logger, Level.DEBUG, "Starts calling PhaseManager#updatePhases method.");
|
@@ -2740,7 +2750,6 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
|
2740 | 2750 | }
|
2741 | 2751 |
|
2742 | 2752 | setNewPhasesProperties(projectHeader, newProjectPhases, (multiRoundEndDate != null), isStudio);
|
2743 |
| - checkPrivateProjectPhase(projectHeader, newProjectPhases); |
2744 | 2753 |
|
2745 | 2754 | return this.createProject(projectHeader, newProjectPhases, projectResources, operator);
|
2746 | 2755 |
|
@@ -5151,25 +5160,11 @@ private void setNewPhasesProperties(Project projectHeader,
|
5151 | 5160 | p.setAttribute(SCORECARD_ID_PHASE_ATTRIBUTE_KEY, String.valueOf(iterativeReviewTemplateId));
|
5152 | 5161 | p.setAttribute("Reviewer Number", "1");
|
5153 | 5162 | }
|
5154 |
| - } |
5155 |
| - } |
5156 | 5163 |
|
5157 |
| - /** |
5158 |
| - * Helper to check project phase status. It must set to CLOSED for private project |
5159 |
| - * |
5160 |
| - * @param projectHeader Project |
5161 |
| - * @param projectPhases Project phases |
5162 |
| - * @since 2.3 |
5163 |
| - */ |
5164 |
| - private void checkPrivateProjectPhase(Project projectHeader, com.topcoder.project.phases.Project projectPhases) { |
5165 |
| - for (Phase p : projectPhases.getAllPhases()) { |
5166 | 5164 | if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId()) {
|
5167 |
| - if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) { |
| 5165 | + if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1") && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) { |
5168 | 5166 | p.setPhaseStatus(PhaseStatus.CLOSED);
|
5169 |
| - }else{ |
5170 |
| - p.setPhaseStatus(PhaseStatus.SCHEDULED); |
5171 | 5167 | }
|
5172 |
| - break; |
5173 | 5168 | }
|
5174 | 5169 | }
|
5175 | 5170 | }
|
|
0 commit comments