[CalendarServer-changes] [6092] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6092
          http://trac.macosforge.org/projects/calendarserver/changeset/6092
Author:   sagen at apple.com
Date:     2010-08-17 11:31:51 -0700 (Tue, 17 Aug 2010)
Log Message:
-----------
Hook up push DAV properties to homes.

Modified Paths:
--------------
    CalendarServer/trunk/txcaldav/calendarstore/postgres.py
    CalendarServer/trunk/txcaldav/calendarstore/test/common.py
    CalendarServer/trunk/txcarddav/addressbookstore/test/common.py

Modified: CalendarServer/trunk/txcaldav/calendarstore/postgres.py
===================================================================
--- CalendarServer/trunk/txcaldav/calendarstore/postgres.py	2010-08-17 18:09:11 UTC (rev 6091)
+++ CalendarServer/trunk/txcaldav/calendarstore/postgres.py	2010-08-17 18:31:51 UTC (rev 6092)
@@ -903,7 +903,10 @@
 
 
     def notifierID(self, label="default"):
-        return None
+        if self._notifier:
+            return self._notifier.getID(label)
+        else:
+            return None
 
 
     def name(self):
@@ -1276,7 +1279,10 @@
 
 
     def notifierID(self, label="default"):
-        return None
+        if self._notifier:
+            return self._notifier.getID(label)
+        else:
+            return None
 
 
 
@@ -1734,7 +1740,10 @@
 
 
     def notifierID(self, label="default"):
-        return None
+        if self._notifier:
+            return self._notifier.getID(label)
+        else:
+            return None
 
 
     def name(self):
@@ -2078,7 +2087,10 @@
 
 
     def notifierID(self, label="default"):
-        return None
+        if self._notifier:
+            return self._notifier.getID(label)
+        else:
+            return None
 
 
 #

Modified: CalendarServer/trunk/txcaldav/calendarstore/test/common.py
===================================================================
--- CalendarServer/trunk/txcaldav/calendarstore/test/common.py	2010-08-17 18:09:11 UTC (rev 6091)
+++ CalendarServer/trunk/txcaldav/calendarstore/test/common.py	2010-08-17 18:31:51 UTC (rev 6092)
@@ -303,6 +303,13 @@
         self.assertProvides(ICalendarObject, self.calendarObjectUnderTest())
 
 
+    def test_notifierID(self):
+        home = self.homeUnderTest()
+        self.assertEquals(home.notifierID(), "home1")
+        calendar = home.calendarWithName("calendar_1")
+        self.assertEquals(calendar.notifierID(), "home1")
+        self.assertEquals(calendar.notifierID(label="collection"), "home1/calendar_1")
+
     def test_calendarHomeWithUID_exists(self):
         """
         Finding an existing calendar home by UID results in an object that

Modified: CalendarServer/trunk/txcarddav/addressbookstore/test/common.py
===================================================================
--- CalendarServer/trunk/txcarddav/addressbookstore/test/common.py	2010-08-17 18:09:11 UTC (rev 6091)
+++ CalendarServer/trunk/txcarddav/addressbookstore/test/common.py	2010-08-17 18:31:51 UTC (rev 6092)
@@ -262,7 +262,14 @@
         """
         self.assertProvides(IAddressBookObject, self.addressbookObjectUnderTest())
 
+    def test_notifierID(self):
+        home = self.homeUnderTest()
+        self.assertEquals(home.notifierID(), "home1")
+        addressbook = home.addressbookWithName("addressbook_1")
+        self.assertEquals(addressbook.notifierID(), "home1")
+        self.assertEquals(addressbook.notifierID(label="collection"), "home1/addressbook_1")
 
+
     def test_addressbookHomeWithUID_exists(self):
         """
         Finding an existing addressbook home by UID results in an object that
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100817/31229baa/attachment-0001.html>