[CalendarServer-changes] [5368] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5368
          http://trac.macosforge.org/projects/calendarserver/changeset/5368
Author:   sagen at apple.com
Date:     2010-03-19 17:55:55 -0700 (Fri, 19 Mar 2010)
Log Message:
-----------
When new locations/resources are created via calendarserver_command_gateway, their default autoSchedule=True will be reflected in calendarserver_manage_principals.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/gateway.py
    CalendarServer/trunk/twistedcaldav/directory/augment.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_modify.py
    CalendarServer/trunk/twistedcaldav/directory/xmlfile.py

Modified: CalendarServer/trunk/calendarserver/tools/gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/gateway.py	2010-03-19 23:59:11 UTC (rev 5367)
+++ CalendarServer/trunk/calendarserver/tools/gateway.py	2010-03-20 00:55:55 UTC (rev 5368)
@@ -213,6 +213,8 @@
             respondWithError(str(e))
             return
 
+        kwargs['guid'] = record.guid
+
         principal = self.dir.principalCollection.principalForRecord(record)
         (yield principal.setAutoSchedule(command.get('AutoSchedule', True)))
 
@@ -289,6 +291,8 @@
             respondWithError(str(e))
             return
 
+        kwargs['guid'] = record.guid
+
         principal = self.dir.principalCollection.principalForRecord(record)
         (yield principal.setAutoSchedule(command.get('AutoSchedule', True)))
 

Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/augment.py	2010-03-19 23:59:11 UTC (rev 5367)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py	2010-03-20 00:55:55 UTC (rev 5368)
@@ -263,6 +263,9 @@
             # Add to first file in list
             self._doAddToFile(self.xmlFiles[0], new_records)
 
+        # This is required to invalidate self.db
+        self.lastCached = 0
+
         return succeed(None)
 
     def _doAddToFile(self, xmlfile, records):

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_modify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_modify.py	2010-03-19 23:59:11 UTC (rev 5367)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_modify.py	2010-03-20 00:55:55 UTC (rev 5368)
@@ -129,3 +129,25 @@
 
         directory.createRecord("resources", guid="resource01", shortNames=("resource01",), uid="resource01")
         self.assertRaises(DirectoryError, directory.createRecord, "resources", guid="resource01", shortNames=("resource01",), uid="resource01")
+
+    def test_missingShortNames(self):
+        directory = getDirectory()
+
+        directory.createRecord("resources", guid="resource01")
+
+        record = directory.recordWithUID("resource01")
+        self.assertEquals(record.shortNames[0], "resource01")
+
+        directory.updateRecord("resources", guid="resource01",
+            fullName="Resource #1")
+
+        record = directory.recordWithUID("resource01")
+        self.assertEquals(record.shortNames[0], "resource01")
+        self.assertEquals(record.fullName, "Resource #1")
+
+    def test_missingGUID(self):
+        directory = getDirectory()
+
+        record = directory.createRecord("resources")
+
+        self.assertEquals(record.shortNames[0], record.guid)

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py	2010-03-19 23:59:11 UTC (rev 5367)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py	2010-03-20 00:55:55 UTC (rev 5368)
@@ -327,6 +327,9 @@
         if guid is None:
             guid = str(uuid4())
 
+        if not shortNames:
+            shortNames = (guid,)
+
         # Make sure latest XML records are read in
         self._lastCheck = 0
         accounts = self._accounts()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100319/4818a266/attachment.html>