[CalendarServer-changes] [13553] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 28 18:40:18 PDT 2014
Revision: 13553
http://trac.calendarserver.org//changeset/13553
Author: sagen at apple.com
Date: 2014-05-28 18:40:18 -0700 (Wed, 28 May 2014)
Log Message:
-----------
Pull in rev 13551 from 6.0-dev branch
Revision Links:
--------------
http://trac.calendarserver.org//changeset/13551
Modified Paths:
--------------
CalendarServer/trunk/conf/auth/resources-test.xml
CalendarServer/trunk/txdav/caldav/datastore/sql.py
CalendarServer/trunk/txdav/common/datastore/test/accounts/resources.xml
Modified: CalendarServer/trunk/conf/auth/resources-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/resources-test.xml 2014-05-29 01:22:33 UTC (rev 13552)
+++ CalendarServer/trunk/conf/auth/resources-test.xml 2014-05-29 01:40:18 UTC (rev 13553)
@@ -30,7 +30,7 @@
<short-name>il1</short-name>
<full-name>IL1</full-name>
<street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.331741,-122.030333</geographic-location>
+ <geographic-location>geo:37.331741,-122.030333</geographic-location>
</record>
<record type="location">
<uid>fantastic</uid>
@@ -43,7 +43,7 @@
<short-name>il2</short-name>
<full-name>IL2</full-name>
<street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.332633,-122.030502</geographic-location>
+ <geographic-location>geo:37.332633,-122.030502</geographic-location>
</record>
<record type="location">
<uid>delegatedroom</uid>
Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-05-29 01:22:33 UTC (rev 13552)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-05-29 01:40:18 UTC (rev 13553)
@@ -2451,7 +2451,7 @@
"X-TITLE": title,
}
structured = Property("X-APPLE-STRUCTURED-LOCATION",
- "geo:{0}".format(geo.encode("utf-8"),), params=params,
+ geo.encode("utf-8"), params=params,
valuetype=Value.VALUETYPE_URI)
sub.replaceProperty(structured)
newLocProperty = Property("LOCATION",
Modified: CalendarServer/trunk/txdav/common/datastore/test/accounts/resources.xml
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/accounts/resources.xml 2014-05-29 01:22:33 UTC (rev 13552)
+++ CalendarServer/trunk/txdav/common/datastore/test/accounts/resources.xml 2014-05-29 01:40:18 UTC (rev 13553)
@@ -107,14 +107,14 @@
<short-name>il1</short-name>
<full-name>One Infinite Loop</full-name>
<street-address>1 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.331741,-122.030333</geographic-location>
+ <geographic-location>geo:37.331741,-122.030333</geographic-location>
</record>
<record type="address">
<uid>2-infinite-loop</uid>
<short-name>il2</short-name>
<full-name>Two Infinite Loop</full-name>
<street-address>2 Infinite Loop, Cupertino, CA 95014</street-address>
- <geographic-location>37.332633,-122.030502</geographic-location>
+ <geographic-location>geo:37.332633,-122.030502</geographic-location>
</record>
</directory>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140528/29300a39/attachment.html>
More information about the calendarserver-changes
mailing list