[commits] (jeffrey) [11124] - [alpha3 branch] Fix for bug 6209, allDay events and switching timezones causes problems, r=grant

[commits]

Title: [commits] (jeffrey) [11124] - [alpha3 branch] Fix for bug 6209, allDay events and switching timezones causes problems, r=grant

Revision

11124

Author

jeffrey

Date

2006-07-11 12:00:17 -0700 (Tue, 11 Jul 2006)

Log Message

- [alpha3 branch] Fix for bug 6209, allDay events and switching timezones causes problems, r=grant

Fixed by using effectiveStartTime and effectiveEndTime.

Modified Paths

• branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarBlocks.py
• branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py

Diff

Modified: branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarBlocks.py (11123 => 11124)

--- branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarBlocks.py	2006-07-11 18:58:19 UTC (rev 11123)
+++ branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarBlocks.py	2006-07-11 19:00:17 UTC (rev 11124)
@@ -228,7 +228,7 @@
             
             for item in Calendar.eventsInRange(view, startDatetime, endDatetime,
                                                events):                                                
-                    updateBusy(item, item.startTime)
+                    updateBusy(item, item.effectiveStartTime)
     
             # Next, try to find all generated events in the given
             # datetime range

Modified: branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py (11123 => 11124)

--- branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-07-11 18:58:19 UTC (rev 11123)
+++ branches/0.7alpha3/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-07-11 19:00:17 UTC (rev 11124)
@@ -906,12 +906,12 @@
         """
         tzprefs = schema.ns('osaf.app', self.itsView).TimezonePrefs
         if tzprefs.showUI:
-            return ((item.startTime <= end) and (item.endTime >= start))
+            return ((item.effectiveStartTime <= end) and (item.effectiveEndTime >= start))
         else:
-            return ((item.startTime.replace(tzinfo=None) <=
-                                end.replace(tzinfo=None)) and
-                      (item.endTime.replace(tzinfo=None) >=
-                              start.replace(tzinfo=None)))
+            return ((item.effectiveStartTime.replace(tzinfo=None) <=
+                                         end.replace(tzinfo=None)) and
+                      (item.effectiveEndTime.replace(tzinfo=None) >=
+                                       start.replace(tzinfo=None)))
 
     def generateItemsInRange(self, date, nextDate, dayItems, timedItems):
         # wish we could put this somewhere more useful, but

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits