From bb40f137269fe9c393e9222bdb3e490fcb903dfd Mon Sep 17 00:00:00 2001 From: JoaoRoxoNeves Date: Mon, 17 Jun 2013 16:25:59 +0100 Subject: [PATCH] [Missions] Bug Fix: Corrected a problem introduced in the last commit due to the lack of parenthesis. --- .../src/main/java/module/mission/domain/MissionYear.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/expenditure-tracking/src/main/java/module/mission/domain/MissionYear.java b/expenditure-tracking/src/main/java/module/mission/domain/MissionYear.java index 39bbc2f4..89941d0b 100644 --- a/expenditure-tracking/src/main/java/module/mission/domain/MissionYear.java +++ b/expenditure-tracking/src/main/java/module/mission/domain/MissionYear.java @@ -271,9 +271,8 @@ private PendingProcessingPersonelInformationSearch(final SortedSet getPendingDirectProcessingPersonelInformation() @Override boolean shouldAdd(final MissionProcess missionProcess, final User user) { return (missionProcess.getCurrentOwner() == null || missionProcess.isTakenByCurrentUser()) - && missionProcess.isCurrentUserAbleToAccessAnyQueues() - && MissionState.PERSONAL_INFORMATION_PROCESSING.isPending(missionProcess) + && (missionProcess.isCurrentUserAbleToAccessAnyQueues() && MissionState.PERSONAL_INFORMATION_PROCESSING + .isPending(missionProcess)) || missionProcess.isReadyForMissionTermination(user) || (missionProcess.isTerminated() && !missionProcess.isArchived() && missionProcess .canArchiveMissionDirect());