- Revision
- 15293
- Author
- jeffrey
- Date
- 2007-08-30 17:27:01 -0700 (Thu, 30 Aug 2007)
Log Message
- Workaround for bug 10726, In or Ou filtered by MailStamp results
in bad indexes after unstamping MailStamp. Worked around my
not filtering in this case, which works great as long as users
don't decide to add non-mail items to their In or Out collections.
Even then, the failure is just some extra items showing up.
This fix doesn't help if In/Out are multi-selected with other
collections, which we're just going to tolerate for Preview.
in bad indexes after unstamping MailStamp. Worked around my
not filtering in this case, which works great as long as users
don't decide to add non-mail items to their In or Out collections.
Even then, the failure is just some extra items showing up.
This fix doesn't help if In/Out are multi-selected with other
collections, which we're just going to tolerate for Preview.
Modified Paths
Diff
Modified: trunk/chandler/application/Utility.py (15292 => 15293)
--- trunk/chandler/application/Utility.py 2007-08-30 22:53:20 UTC (rev 15292) +++ trunk/chandler/application/Utility.py 2007-08-31 00:27:01 UTC (rev 15293) @@ -35,7 +35,7 @@ # with your name (and some helpful text). The comment's really there just to # cause Subversion to warn you of a conflict when you update, in case someone # else changes it at the same time you do (that's why it's on the same line). -SCHEMA_VERSION = "451" # jeffrey: ISCs filter on contentItems +SCHEMA_VERSION = "452" # jeffrey: never filter In/Out on MailStamp logger = None # initialized in initLogging()
Modified: trunk/chandler/parcels/osaf/views/main/SideBar.py (15292 => 15293)
--- trunk/chandler/parcels/osaf/views/main/SideBar.py 2007-08-30 22:53:20 UTC (rev 15292) +++ trunk/chandler/parcels/osaf/views/main/SideBar.py 2007-08-31 00:27:01 UTC (rev 15293) @@ -1453,6 +1453,14 @@ if len(collectionList) == 1: key = collectionList[0] + # fix for bug 10726, Intersecting In or Out with MailStamp + # should be a no-op, since In and Out are already based + # on MailStamp's kind collection. This is actually + # not quite right if In/Out have inclusions, but we're + # tolerating that for 0.7.0 + if filterClass == pim.MailStamp: + if key in (pim_ns.inCollection, pim_ns.outCollection): + filterClass = MissingClass else: # UnionCollection removes trash from its children before # bringing them together
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
