[CalendarServer-changes] [10751] CalendarServer/branches/users/gaya/sharedgroups

source_changes at macosforge.org source_changes at macosforge.org
Fri Feb 15 16:53:00 PST 2013


Revision: 10751
          http://trac.calendarserver.org//changeset/10751
Author:   gaya at apple.com
Date:     2013-02-15 16:53:00 -0800 (Fri, 15 Feb 2013)
Log Message:
-----------
Use simpler error strings

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/storebridge.py
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/iaddressbookstore.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/storebridge.py	2013-02-16 00:47:27 UTC (rev 10750)
+++ CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/storebridge.py	2013-02-16 00:53:00 UTC (rev 10751)
@@ -3001,7 +3001,7 @@
         except GroupWithUnsharedAddressNotAllowedError:
             raise HTTPError(StatusResponse(
                 FORBIDDEN,
-                "Sharee cannot add or modify group vcard such that result contains addresses of unshared vcards.",)
+                "Sharee cannot add unshared group members",)
             )
 
     @inlineCallbacks
@@ -3013,7 +3013,7 @@
         except GroupForSharedAddressBookDeleteNotAllowedError:
             raise HTTPError(StatusResponse(
                 FORBIDDEN,
-                "Sharee cannot delete the group for a whole address book ",)
+                "Sharee cannot delete the group for a shared address book",)
             )
 
         except SharedGroupDeleteNotAllowedError:

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/iaddressbookstore.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/iaddressbookstore.py	2013-02-16 00:47:27 UTC (rev 10750)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/iaddressbookstore.py	2013-02-16 00:53:00 UTC (rev 10751)
@@ -38,19 +38,19 @@
 
 class GroupForSharedAddressBookDeleteNotAllowedError(CommonStoreError):
     """
-    Sharee cannot delete the group for a shared address book
+    Sharee cannot delete the group for a shared address book.
     """
 
 
 class GroupWithUnsharedAddressNotAllowedError(CommonStoreError):
     """
-    Sharee cannot add or modify group vcard such that result contains addresses of unshared vcards.
+    Sharee cannot add unshared group members.
     """
 
 
 class SharedGroupDeleteNotAllowedError(CommonStoreError):
     """
-    Sharee cannot delete a shared group
+    Sharee cannot delete a shared group.
     """
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130215/bf6cf1de/attachment.html>


More information about the calendarserver-changes mailing list