From 04a7b96dae87e148cbe7db0f917dcc2877cde9a7 Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Tue, 10 Dec 2024 15:24:04 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(innovation):=20Adjustment?= =?UTF-8?q?=20in=20validators?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/ProjectInnovationValidator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java index 81680c1bf8..8c7d7385bd 100644 --- a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java +++ b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java @@ -201,11 +201,11 @@ public void validateAllianceAlignment(BaseAction action, Project project, Projec action.addMissingField("innovation.allianceLevers"); action.getInvalidFields().put("input-innovation.allianceLevers", InvalidFieldsMessages.EMPTYFIELD); } + } - innovationAlliance = action.getMissingFields().toString(); - if (projectInnovation.getId() != null && (innovationAlliance.length() > innovationGeneral.length())) { - BaseAction.getIsInnovationAllianceAlignmentCompleteMap().put("" + projectInnovation.getId(), "1"); - } + innovationAlliance = action.getMissingFields().toString(); + if (projectInnovation.getId() != null && (innovationAlliance.length() > innovationGeneral.length())) { + BaseAction.getIsInnovationAllianceAlignmentCompleteMap().put("" + projectInnovation.getId(), "1"); } } @@ -286,7 +286,7 @@ public void validateGeneralInformation(BaseAction action, Project project, Proje } - if (innovationInfo != null && (innovationInfo.getHasMilestones() == null)) { + if (!action.isAiccra() && innovationInfo != null && (innovationInfo.getHasMilestones() == null)) { action.addMessage(action.getText("projectOutcomes")); action.addMissingField("innovation.projectOutcomes"); action.getInvalidFields().put("list-innovation.projectOutcomes",