Author: knguyen
Date: Tue Sep 11 18:16:34 2007
New Revision: 18424
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18424&repname=
=3Djahia
Log:
JAHIA-2208: fix switching between recurrence type for time based publishing.
Modified:
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/timebasedpublishing/DayInWeekBean.java
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/s=
ervices/timebasedpublishing/DayInWeekBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/services/timebasedpublishing/D=
ayInWeekBean.java&rev=3D18424&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/timebasedpublishing/DayInWeekBean.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/timebasedpublishing/DayInWeekBean.java Tue Sep 11 18:16:34 2007
@@ -256,7 +256,7 @@
int todayDayInWeek =3D nowCalendar.get(Calendar.DAY_OF_WEEK);
int dayInWeek =3D DayInWeekBean.getJavaCalendarDayOfWeek(dayBean);
nowCal.set(Calendar.DAY_OF_WEEK,dayInWeek);
- if ( dayInWeek<=3DtodayDayInWeek ){
+ if ( dayInWeek !=3D 1 && dayInWeek<=3DtodayDayInWeek ){
nowCal.add(Calendar.WEEK_OF_MONTH,1); // add one week
}
nowCal.set(Calendar.HOUR_OF_DAY,dayBean.getFromHours());
@@ -272,7 +272,7 @@
nowCal.set(Calendar.SECOND,0);
nowCal.set(Calendar.MILLISECOND,0);
nowCal.set(Calendar.DAY_OF_WEEK,dayInWeek);
- if ( dayInWeek<=3DtodayDayInWeek ){
+ if ( dayInWeek !=3D 1 && dayInWeek<=3DtodayDayInWeek ){
nowCal.add(Calendar.WEEK_OF_MONTH,1); // add one week
}
if ( (dayBean.getFromHours() =3D=3D dayBean.getToHours() &&
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
