[CalendarServer-changes] [7975] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin

source_changes at macosforge.org source_changes at macosforge.org
Thu Aug 11 21:54:22 PDT 2011


Revision: 7975
          http://trac.macosforge.org/projects/calendarserver/changeset/7975
Author:   glyph at apple.com
Date:     2011-08-11 21:54:22 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
make sure to deal with rendering unknown record types without exception

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:54:10 UTC (rev 7974)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:54:22 UTC (rev 7975)
@@ -166,7 +166,7 @@
                 "groups"    : "Group",
                 "locations" : "Place",
                 "resources" : "Resource",
-            }.get(record.recordType),
+            }.get(record.recordType, repr(record.recordType)),
             shortNames=str(", ".join(record.shortNames)),
             authIds=str(", ".join(record.authIDs)),
             emails=str(", ".join(record.emailAddresses)),

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:54:10 UTC (rev 7974)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:54:22 UTC (rev 7975)
@@ -108,16 +108,16 @@
         self.expectRecordSearch(
             "bob", [
                 DirectoryRecord(
-                    service=self, recordType='users', guid=None,
+                    service=self, recordType=recordType, guid=None,
                     authIDs=authIds, emailAddresses=tuple(emails),
                     shortNames=tuple(shortNames), fullName=fullName
                 )
-                for (shortNames, fullName, authIds, emails)
+                for (shortNames, fullName, authIds, emails, recordType)
                 in [
                     (["bob"], "Bob Bobson", ["boblogin"],
-                     ["bob at example.com", "bob at other.example.com"]),
+                     ["bob at example.com", "bob at other.example.com"], 'users'),
                     (["bobd"], "Bob Dobson", ["bobdlogin"],
-                     ["bobd at example.com"]),
+                     ["bobd at example.com"], 'sudoers'),
                    ]
             ])
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/546ec3b0/attachment.html>


More information about the calendarserver-changes mailing list