RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into filtering-improvements

Browse source
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-01 13:14:53 +01:00
commit 58ad890227
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarAvailability.java
View file

@ -150,8 +150,8 @@ public class CalendarAvailability extends IntegrationEntity {
}
if (endDate == null) {
return startDate.compareTo(filterStartDate) >= 0
&& startDate.compareTo(filterEndDate) <= 0;
return startDate.compareTo(filterStartDate) <= 0
|| startDate.compareTo(filterEndDate) <= 0;
}
Interval filterPeriod = new Interval(