[CalendarServer-changes] [13958] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Sep 12 10:07:21 PDT 2014
Revision: 13958
http://trac.calendarserver.org//changeset/13958
Author: sagen at apple.com
Date: 2014-09-12 10:07:21 -0700 (Fri, 12 Sep 2014)
Log Message:
-----------
Remove auto-schedule, first-name, and last-name from liveProperties
Modified Paths:
--------------
CalendarServer/trunk/requirements-dev.txt
CalendarServer/trunk/twistedcaldav/customxml.py
CalendarServer/trunk/twistedcaldav/directory/principal.py
CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
CalendarServer/trunk/twistedcaldav/resource.py
CalendarServer/trunk/twistedcaldav/storebridge.py
Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- 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)
@@ -7,4 +7,4 @@
mockldap
q
--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13914#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13957#egg=CalDAVTester
Modified: CalendarServer/trunk/twistedcaldav/customxml.py
===================================================================
--- 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)
@@ -817,16 +817,7 @@
- at registerElement
-class AutoSchedule (WebDAVTextElement):
- """
- Whether the principal automatically accepts invitations
- """
- namespace = calendarserver_namespace
- name = "auto-schedule"
-
-
@registerElement
class AutoScheduleMode (WebDAVTextElement):
"""
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- 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)
@@ -233,10 +233,6 @@
("", cuTypeConverter, "Calendar User Type", caldavxml.CalendarUserType),
("urn:ietf:params:xml:ns:caldav" , "calendar-user-address-set") :
("", cuAddressConverter, "Calendar User Address Set", caldavxml.CalendarUserAddressSet),
- (_cs_ns, "first-name") :
- ("firstName", None, "First Name", customxml.FirstNameProperty),
- (_cs_ns, "last-name") :
- ("lastName", None, "Last Name", customxml.LastNameProperty),
(_cs_ns, "email-address-set") :
("emailAddresses", None, "Email Addresses", customxml.EmailAddressSet),
}
@@ -787,8 +783,6 @@
def liveProperties(self):
return super(DirectoryPrincipalResource, self).liveProperties() + (
- (calendarserver_namespace, "first-name"),
- (calendarserver_namespace, "last-name"),
(calendarserver_namespace, "email-address-set"),
davxml.ResourceID.qname(),
)
@@ -863,22 +857,6 @@
returnValue(davxml.ResourceID(davxml.HRef.fromString("urn:x-uid:%s" % (self.record.uid,))))
elif namespace == calendarserver_namespace:
-
- # 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)
-
if name == "email-address-set":
try:
emails = self.record.emailAddresses
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- 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)
@@ -942,14 +942,6 @@
"emailAddresses", "example at example.com"
),
(
- "http://calendarserver.org/ns/", "first-name",
- "morgen", "firstName", "morgen"
- ),
- (
- "http://calendarserver.org/ns/", "last-name",
- "sagen", "lastName", "sagen"
- ),
- (
"http://calendarserver.org/ns/", "email-address-set",
"example at example.com", "emailAddresses", "example at example.com"
),
Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- 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)
@@ -1672,7 +1672,6 @@
(caldav_namespace, "calendar-user-type"),
(calendarserver_namespace, "calendar-proxy-read-for"),
(calendarserver_namespace, "calendar-proxy-write-for"),
- (calendarserver_namespace, "auto-schedule"),
(calendarserver_namespace, "auto-schedule-mode"),
)
@@ -1770,10 +1769,6 @@
*[element.HRef(principal.principalURL()) for principal in results]
))
- # elif name == "auto-schedule" and self.calendarsEnabled():
- # autoSchedule = yield self.getAutoSchedule()
- # returnValue(customxml.AutoSchedule("true" if autoSchedule else "false"))
-
elif name == "auto-schedule-mode" and self.calendarsEnabled():
autoScheduleMode = yield self.getAutoScheduleMode()
returnValue(customxml.AutoScheduleMode(autoScheduleMode.description if autoScheduleMode else "default"))
Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- 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)
@@ -4015,8 +4015,6 @@
customxml.InviteSummary.fromString(jsondata["summary"]) if jsondata["summary"] else None,
customxml.CommonName.fromString(commonName) if commonName else None,
**typeAttr
- # customxml.FirstNameProperty(record.firstName) if record.firstName else None,
- # customxml.LastNameProperty(record.lastName) if record.lastName else None,
),
)
else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140912/c1e8c127/attachment-0001.html>
More information about the calendarserver-changes
mailing list