[commits] (rae) [15908] Fix for bug 11450 (Traceback on click of "view 1 pending change" red bar in detail view), r=morgen

[commits]

Title: [commits] (rae) [15908] Fix for bug 11450 (Traceback on click of "view 1 pending change" red bar in detail view), r=morgen

Revision

15908

Author

rae

Date

2007-11-26 13:55:17 -0800 (Mon, 26 Nov 2007)

Log Message

Fix for bug 11450 (Traceback on click of "view 1 pending change" red bar in detail view), r=morgen
Just set the value to an empty string.

Modified Paths

• branches/multiweekview/chandler/application/dialogs/ConflictDialog.py

Diff

Modified: branches/multiweekview/chandler/application/dialogs/ConflictDialog.py (15907 => 15908)

--- branches/multiweekview/chandler/application/dialogs/ConflictDialog.py	2007-11-26 20:40:18 UTC (rev 15907)
+++ branches/multiweekview/chandler/application/dialogs/ConflictDialog.py	2007-11-26 21:55:17 UTC (rev 15908)
@@ -165,6 +165,7 @@
                 # L10N: The <emphasis> and </emphasis> tags are used in the Conflict Resolution dialog
                 # to make the text in between the tags bold.
                 fmt = _(u"%(conflictNumber)3d. %(user)s removed this item from the <emphasis>collection</emphasis>")
+                c.value = ""
             elif c.change.exclusions:
                 # stamp changed on an item where stamp was removed on the server
                 if "sharing.model.MailMessageRecord" in c.value:

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