[CalendarServer-changes] [13883] CalendarServer/trunk/txdav/common/datastore/sql.py

[source_changes at macosforge.org]

Revision: 13883
          http://trac.calendarserver.org//changeset/13883
Author:   gaya at apple.com
Date:     2014-08-16 11:13:50 -0700 (Sat, 16 Aug 2014)
Log Message:
-----------
fix code in UpdateShare() added in r13775 that prevents 2nd identical invite from generating 2nd identical notification

Revision Links:
--------------
    http://trac.calendarserver.org//changeset/13775

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2014-08-16 01:09:50 UTC (rev 13882)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2014-08-16 18:13:50 UTC (rev 13883)
@@ -5033,11 +5033,11 @@
         # remove None parameters, and substitute None for empty string
         bind = self._bindSchema
         columnMap = {}
-        if mode != None and mode != self._bindMode:
+        if mode != None and mode != shareeView._bindMode:
             columnMap[bind.BIND_MODE] = mode
-        if status != None:# and status != self._bindStatus:  # FIXME:
+        if status != None and status != shareeView._bindStatus:
             columnMap[bind.BIND_STATUS] = status
-        if summary != None and summary and summary != self._bindMessage:
+        if summary != None and summary != shareeView._bindMessage:
             columnMap[bind.MESSAGE] = summary
 
         if columnMap:
@@ -5059,7 +5059,7 @@
                 shareeView._bindStatus = columnMap[bind.BIND_STATUS]
                 yield shareeView._changedStatus(previouslyAcceptedCount)
 
-            if summary is not None:
+            if bind.MESSAGE in columnMap:
                 shareeView._bindMessage = columnMap[bind.MESSAGE]
 
             yield shareeView.invalidateQueryCache()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140816/2a766acc/attachment.html>