[Commits] (alecf) fix bug 2860 - track john's 'renameable' attribute to make sure we don't grab colors from an out-of-the-box colleciton

[commits at osafoundation.org]

Commit by: alecf
Modified files:
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.80 1.81

Log message:
fix bug 2860 - track john's 'renameable' attribute to make sure we don't grab colors from an out-of-the-box colleciton

Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2860

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.80&r2=text&tr2=1.81

Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
diff -u chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.80 chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.81
--- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.80	Fri Apr 22 13:32:27 2005
+++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	Sun Apr 24 20:26:05 2005
@@ -1,8 +1,8 @@
 """ Canvas for calendaring blocks
 """
 
-__version__ = "$Revision: 1.80 $"
-__date__ = "$Date: 2005/04/22 20:32:27 $"
+__version__ = "$Revision: 1.81 $"
+__date__ = "$Date: 2005/04/25 03:26:05 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -632,7 +632,9 @@
         calDataKind = CalendarData.getKind(view=self.itsView)
         for coll in containingCollections:
 
-            if not hasattr(coll, 'outOfTheBoxCollection') and \
+            # hack alert! The out-of-the-box collections aren't renameable, so
+            # we'll rely on that to make sure we don't get 'All's color
+            if (not hasattr(coll, 'renameable') or coll.renameable) and \
                 coll.isItemOf(calDataKind):
                 return coll.calendarColor
         return None