<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13333] CalendarServer/trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13333">13333</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 14:02:12 -0700 (Fri, 18 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>reconcileGroupAttendees() returns changed</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13332 => 13333)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py        2014-04-18 20:46:13 UTC (rev 13332)
+++ CalendarServer/trunk/twistedcaldav/ical.py        2014-04-18 21:02:12 UTC (rev 13333)
</span><span class="lines">@@ -3399,6 +3399,7 @@
</span><span class="cx"> 
</span><span class="cx">     def _reconcileGroupAttendee(self, groupCUA, memberAtttendeeProps):
</span><span class="cx"> 
</span><ins>+        changed = False
</ins><span class="cx">         for component in self.subcomponents():
</span><span class="cx">             if component.name() in ignoredComponents:
</span><span class="cx">                 continue
</span><span class="lines">@@ -3412,6 +3413,7 @@
</span><span class="cx">                 memberCUA = newAttendeeProp.value()
</span><span class="cx">                 if newAttendeeProp.value() not in oldAttendeeCUAs:
</span><span class="cx">                     component.addProperty(newAttendeeProp)
</span><ins>+                    changed = True
</ins><span class="cx">                 memberCUAs.add(memberCUA)
</span><span class="cx"> 
</span><span class="cx">             # remove attendee or update MEMBER attribute for non-primary attendees in this group,
</span><span class="lines">@@ -3423,16 +3425,21 @@
</span><span class="cx">                             attendeeProp.removeParameterValue(&quot;MEMBER&quot;, groupCUA)
</span><span class="cx">                             if not attendeeProp.parameterValues(&quot;MEMBER&quot;):
</span><span class="cx">                                 component.removeProperty(attendeeProp)
</span><ins>+                                changed = True
</ins><span class="cx">                     else:
</span><span class="cx">                         if attendeeProp.value() in memberCUAs:
</span><span class="cx">                             attendeeProp.setParameter(&quot;MEMBER&quot;, parameterValues + (groupCUA,))
</span><ins>+                            changed = True
</ins><span class="cx"> 
</span><ins>+        return changed
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     def reconcileGroupAttendees(self, groupCUAToAttendeeMemberPropMap):
</span><span class="cx"> 
</span><ins>+        changed = False
</ins><span class="cx">         allMemberCUAs = set()
</span><span class="cx">         for groupCUA, memberAttendeeProps in groupCUAToAttendeeMemberPropMap.iteritems():
</span><del>-            self._reconcileGroupAttendee(groupCUA, memberAttendeeProps)
</del><ins>+            changed |= self._reconcileGroupAttendee(groupCUA, memberAttendeeProps)
</ins><span class="cx">             allMemberCUAs |= set([memberAttendeeProp.value() for memberAttendeeProp in memberAttendeeProps])
</span><span class="cx"> 
</span><span class="cx">         # remove orphans
</span><span class="lines">@@ -3445,8 +3452,11 @@
</span><span class="cx">                     attendeeCUA = attendeeMemberProp.value()
</span><span class="cx">                     if attendeeCUA not in allMemberCUAs:
</span><span class="cx">                         component.removeProperty(attendeeMemberProp)
</span><ins>+                        changed = True
</ins><span class="cx"> 
</span><ins>+        return changed
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     def allPerUserUIDs(self):
</span><span class="cx"> 
</span><span class="cx">         results = set()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13332 => 13333)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-04-18 20:46:13 UTC (rev 13332)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-04-18 21:02:12 UTC (rev 13333)
</span><span class="lines">@@ -1936,7 +1936,7 @@
</span><span class="cx">         reconcile group attendees
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         if not config.Scheduling.Options.AllowGroupAsAttendee:
</span><del>-            returnValue(None)
</del><ins>+            returnValue(False)
</ins><span class="cx"> 
</span><span class="cx">         attendeeProps = component.getAllAttendeeProperties()
</span><span class="cx">         groupCUAs = set([
</span><span class="lines">@@ -1955,12 +1955,14 @@
</span><span class="cx">                 )
</span><span class="cx"> 
</span><span class="cx">         # sync group attendees
</span><del>-        component.reconcileGroupAttendees(groupCUAToAttendeeMemberPropMap)
</del><ins>+        changed = component.reconcileGroupAttendees(groupCUAToAttendeeMemberPropMap)
</ins><span class="cx"> 
</span><span class="cx">         # save for post processing
</span><span class="cx">         self._groupCUAToAttendeeMemberPropMap = groupCUAToAttendeeMemberPropMap
</span><span class="cx"> 
</span><ins>+        returnValue(changed)
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def updateGROUP_ATTENDEE(self):
</span><span class="cx">         &quot;&quot;&quot;
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13332 => 13333)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py        2014-04-18 20:46:13 UTC (rev 13332)
+++ CalendarServer/trunk/txdav/who/groups.py        2014-04-18 21:02:12 UTC (rev 13333)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete, Select
</span><span class="cx"> from twext.enterprise.jobqueue import WorkItem, PeerConnectionPool
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twistedcaldav.ical import normalize_iCalStr
</del><span class="cx"> from txdav.caldav.datastore.sql import CalendarStoreFeatures
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema
</span><span class="cx"> import datetime
</span><span class="lines">@@ -178,15 +177,14 @@
</span><span class="cx"> 
</span><span class="cx">         # get db object
</span><span class="cx">         calendarObject = (yield CalendarStoreFeatures(self.transaction._store).calendarObjectWithID(self.transaction, self.resourceID))
</span><del>-        oldComponent = yield calendarObject.componentForUser()
</del><ins>+        component = yield calendarObject.componentForUser()
</ins><span class="cx"> 
</span><span class="cx">         # Change a copy of the original, as we need the original cached on the resource
</span><span class="cx">         # so we can do a diff to test implicit scheduling changes
</span><del>-        component = oldComponent.duplicate()
</del><ins>+        component = component.duplicate()
</ins><span class="cx"> 
</span><span class="cx">         # sync group attendees
</span><del>-        calendarObject.reconcileGroupAttendees(component)
-        if normalize_iCalStr(oldComponent, sort=True) != normalize_iCalStr(component, sort=True):
</del><ins>+        if calendarObject.reconcileGroupAttendees(component):
</ins><span class="cx">             yield calendarObject.setComponent(component)
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>