[CMF-checkins] CVS: Products/CMFCalendar - CalendarTool.py:1.8.10.5

Stefan H. Holek stefan at epy.co.at
Tue Aug 3 06:27:17 EDT 2004


Update of /cvs-repository/Products/CMFCalendar
In directory cvs.zope.org:/tmp/cvs-serv29516/CMFCalendar

Modified Files:
      Tag: CMF-1_4-branch
	CalendarTool.py 
Log Message:
Backported tests and fix for http://collector.zope.org/CMF/159


=== Products/CMFCalendar/CalendarTool.py 1.8.10.4 => 1.8.10.5 ===
--- Products/CMFCalendar/CalendarTool.py:1.8.10.4	Thu Jul 29 14:29:20 2004
+++ Products/CMFCalendar/CalendarTool.py	Tue Aug  3 06:26:46 2004
@@ -129,12 +129,9 @@
         """ given a year and month return a list of days that have events """
         year=int(year)
         month=int(month)
-        first_date=DateTime(year, month, 1)
         last_day=calendar.monthrange(year, month)[1]
-        ## This line was cropping the last day of the month out of the
-        ## calendar when doing the query
-        ## last_date=DateTime(year, month, last_day)
-        last_date=first_date + last_day
+        first_date=self.getBeginAndEndTimes(1, month, year)[0]
+        last_date=self.getBeginAndEndTimes(last_day, month, year)[1]
 
         query=self.portal_catalog(portal_type=self.calendar_types,
                                   review_state='published',



More information about the CMF-checkins mailing list