Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Only close registration phase in draft status #181

Merged
merged 2 commits into from
Dec 23, 2016
Merged

Only close registration phase in draft status #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fe9aec
only close the registration phase when in draft status
skyhit Dec 23, 2016
9fa677d
Merge branch 'dev' into only_close_registration_phase_in_draft_status
skyhit Dec 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions ...project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,6 @@
* <ul>
* <li>updated on {@link #createProjectWithTemplate(Project, com.topcoder.project.phases.Project, Resource[], Date, Date, String)}</li>
* <li>updated on {@link #updateProject(Project, String, com.topcoder.project.phases.Project, Resource[], Date, Date, String)}</li>
* <li>added {@link #checkPrivateProjectPhase(Project, com.topcoder.project.phases.Project)}</li>
* </ul>
* <p>
*
Expand Down Expand Up @@ -2080,10 +2079,15 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
// code with auto assigned review only requires one reviewer.
p.setAttribute("Reviewer Number", "2");
}

if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId()) {
if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1") && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) {
p.setPhaseStatus(PhaseStatus.CLOSED);
}
}
}
}

checkPrivateProjectPhase(projectHeader, projectPhases);
setScorecards(projectHeader, projectPhases);
// call phaseManager.updatePhases(projectPhases,operator)
Util.log(logger, Level.DEBUG, "Starts calling PhaseManager#updatePhases method.");
Expand Down Expand Up @@ -2740,7 +2744,6 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
}

setNewPhasesProperties(projectHeader, newProjectPhases, (multiRoundEndDate != null), isStudio);
checkPrivateProjectPhase(projectHeader, newProjectPhases);

return this.createProject(projectHeader, newProjectPhases, projectResources, operator);

Expand Down Expand Up @@ -5151,25 +5154,11 @@ private void setNewPhasesProperties(Project projectHeader,
p.setAttribute(SCORECARD_ID_PHASE_ATTRIBUTE_KEY, String.valueOf(iterativeReviewTemplateId));
p.setAttribute("Reviewer Number", "1");
}
}
}

/**
* Helper to check project phase status. It must set to CLOSED for private project
*
* @param projectHeader Project
* @param projectPhases Project phases
* @since 2.3
*/
private void checkPrivateProjectPhase(Project projectHeader, com.topcoder.project.phases.Project projectPhases) {
for (Phase p : projectPhases.getAllPhases()) {
if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId()) {
if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) {
if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1") && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) {
p.setPhaseStatus(PhaseStatus.CLOSED);
}else{
p.setPhaseStatus(PhaseStatus.SCHEDULED);
}
break;
}
}
}
Expand Down