From 6ff511bdbaaeae2372872b54028a63d6b3dcc5b7 Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Mon, 26 Feb 2024 16:33:38 -0500 Subject: [PATCH] :wrench: fix(Project outcome): Filter phase year to show milestones tabs --- .../ccafs/marlo/action/projects/ProjectOutcomeAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/ProjectOutcomeAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/ProjectOutcomeAction.java index 1a59cc3059..02443afe3c 100644 --- a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/ProjectOutcomeAction.java +++ b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/ProjectOutcomeAction.java @@ -728,7 +728,8 @@ public void fillMilestonesProjectYearsList() { if (milestonesProject != null && !milestonesProject.isEmpty()) { milestonesProjectYear = new ArrayList<>(); for (CrpMilestone milestoneElement : milestonesProject) { - if (milestoneElement != null && milestoneElement.getYear() != null && !milestoneElement.getYear().equals(0)) { + if (milestoneElement != null && milestoneElement.getYear() != null && !milestoneElement.getYear().equals(0) + && milestoneElement.getYear() <= this.getActualPhase().getYear()) { milestonesProjectYear.add(milestoneElement.getYear()); } }