<!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>[13958] 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/13958">13958</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 10:07:21 -0700 (Fri, 12 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove auto-schedule, first-name, and last-name from liveProperties</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcustomxmlpy">CalendarServer/trunk/twistedcaldav/customxml.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryprincipalpy">CalendarServer/trunk/twistedcaldav/directory/principal.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_principalpy">CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (13957 => 13958)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2014-09-12 17:05:10 UTC (rev 13957)
+++ CalendarServer/trunk/requirements-dev.txt 2014-09-12 17:07:21 UTC (rev 13958)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13914#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13957#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcustomxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/customxml.py (13957 => 13958)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/customxml.py 2014-09-12 17:05:10 UTC (rev 13957)
+++ CalendarServer/trunk/twistedcaldav/customxml.py 2014-09-12 17:07:21 UTC (rev 13958)
</span><span class="lines">@@ -817,16 +817,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-@registerElement
-class AutoSchedule (WebDAVTextElement):
- """
- Whether the principal automatically accepts invitations
- """
- namespace = calendarserver_namespace
- name = "auto-schedule"
</del><span class="cx">
</span><del>-
-
</del><span class="cx"> @registerElement
</span><span class="cx"> class AutoScheduleMode (WebDAVTextElement):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryprincipalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py (13957 => 13958)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-09-12 17:05:10 UTC (rev 13957)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-09-12 17:07:21 UTC (rev 13958)
</span><span class="lines">@@ -233,10 +233,6 @@
</span><span class="cx"> ("", cuTypeConverter, "Calendar User Type", caldavxml.CalendarUserType),
</span><span class="cx"> ("urn:ietf:params:xml:ns:caldav" , "calendar-user-address-set") :
</span><span class="cx"> ("", cuAddressConverter, "Calendar User Address Set", caldavxml.CalendarUserAddressSet),
</span><del>- (_cs_ns, "first-name") :
- ("firstName", None, "First Name", customxml.FirstNameProperty),
- (_cs_ns, "last-name") :
- ("lastName", None, "Last Name", customxml.LastNameProperty),
</del><span class="cx"> (_cs_ns, "email-address-set") :
</span><span class="cx"> ("emailAddresses", None, "Email Addresses", customxml.EmailAddressSet),
</span><span class="cx"> }
</span><span class="lines">@@ -787,8 +783,6 @@
</span><span class="cx"> def liveProperties(self):
</span><span class="cx">
</span><span class="cx"> return super(DirectoryPrincipalResource, self).liveProperties() + (
</span><del>- (calendarserver_namespace, "first-name"),
- (calendarserver_namespace, "last-name"),
</del><span class="cx"> (calendarserver_namespace, "email-address-set"),
</span><span class="cx"> davxml.ResourceID.qname(),
</span><span class="cx"> )
</span><span class="lines">@@ -863,22 +857,6 @@
</span><span class="cx"> returnValue(davxml.ResourceID(davxml.HRef.fromString("urn:x-uid:%s" % (self.record.uid,))))
</span><span class="cx">
</span><span class="cx"> elif namespace == calendarserver_namespace:
</span><del>-
- # MOVE2WHO
- # if name == "first-name":
- # firstName = self.record.firstName
- # if firstName is not None:
- # returnValue(customxml.FirstNameProperty(firstName))
- # else:
- # returnValue(None)
-
- # elif name == "last-name":
- # lastName = self.record.lastName
- # if lastName is not None:
- # returnValue(customxml.LastNameProperty(lastName))
- # else:
- # returnValue(None)
-
</del><span class="cx"> if name == "email-address-set":
</span><span class="cx"> try:
</span><span class="cx"> emails = self.record.emailAddresses
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py (13957 => 13958)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2014-09-12 17:05:10 UTC (rev 13957)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2014-09-12 17:07:21 UTC (rev 13958)
</span><span class="lines">@@ -942,14 +942,6 @@
</span><span class="cx"> "emailAddresses", "example@example.com"
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- "http://calendarserver.org/ns/", "first-name",
- "morgen", "firstName", "morgen"
- ),
- (
- "http://calendarserver.org/ns/", "last-name",
- "sagen", "lastName", "sagen"
- ),
- (
</del><span class="cx"> "http://calendarserver.org/ns/", "email-address-set",
</span><span class="cx"> "example@example.com", "emailAddresses", "example@example.com"
</span><span class="cx"> ),
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (13957 => 13958)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2014-09-12 17:05:10 UTC (rev 13957)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2014-09-12 17:07:21 UTC (rev 13958)
</span><span class="lines">@@ -1672,7 +1672,6 @@
</span><span class="cx"> (caldav_namespace, "calendar-user-type"),
</span><span class="cx"> (calendarserver_namespace, "calendar-proxy-read-for"),
</span><span class="cx"> (calendarserver_namespace, "calendar-proxy-write-for"),
</span><del>- (calendarserver_namespace, "auto-schedule"),
</del><span class="cx"> (calendarserver_namespace, "auto-schedule-mode"),
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -1770,10 +1769,6 @@
</span><span class="cx"> *[element.HRef(principal.principalURL()) for principal in results]
</span><span class="cx"> ))
</span><span class="cx">
</span><del>- # elif name == "auto-schedule" and self.calendarsEnabled():
- # autoSchedule = yield self.getAutoSchedule()
- # returnValue(customxml.AutoSchedule("true" if autoSchedule else "false"))
-
</del><span class="cx"> elif name == "auto-schedule-mode" and self.calendarsEnabled():
</span><span class="cx"> autoScheduleMode = yield self.getAutoScheduleMode()
</span><span class="cx"> returnValue(customxml.AutoScheduleMode(autoScheduleMode.description if autoScheduleMode else "default"))
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13957 => 13958)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-09-12 17:05:10 UTC (rev 13957)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-09-12 17:07:21 UTC (rev 13958)
</span><span class="lines">@@ -4015,8 +4015,6 @@
</span><span class="cx"> customxml.InviteSummary.fromString(jsondata["summary"]) if jsondata["summary"] else None,
</span><span class="cx"> customxml.CommonName.fromString(commonName) if commonName else None,
</span><span class="cx"> **typeAttr
</span><del>- # customxml.FirstNameProperty(record.firstName) if record.firstName else None,
- # customxml.LastNameProperty(record.lastName) if record.lastName else None,
</del><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> else:
</span></span></pre>
</div>
</div>
</body>
</html>