[CalendarServer-changes] [7946] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin/resource.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Aug 11 21:48:41 PDT 2011


Revision: 7946
          http://trac.macosforge.org/projects/calendarserver/changeset/7946
Author:   glyph at apple.com
Date:     2011-08-11 21:48:41 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
implement dav properties

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/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:48:29 UTC (rev 7945)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:48:41 UTC (rev 7946)
@@ -185,11 +185,21 @@
 class DetailsElement(Element):
 
     def __init__(self, resourceId, principalResource, davPropertyName, tag):
-        # FIXME IMPLEMENT
         self.principalResource = principalResource
         tag.fillSlots(resourceTitle=unicode(principalResource),
                       resourceId=resourceId,
                       davPropertyName=davPropertyName)
+        try:
+            namespace, name = davPropertyName.split("#")
+        except Exception:
+            self.namespace = None
+            self.name = None
+            self.error = True
+        else:
+            self.namespace = namespace
+            self.name = name
+            self.error = False
+
         super(DetailsElement, self).__init__(loader=stan(tag))
 
 
@@ -204,13 +214,16 @@
 
 
     @renderer
+    @inlineCallbacks
     def davProperty(self, request, tag):
         """
         Renderer to display an error when the user specifies an invalid property
         name.
         """
-        # FIXME IMPLEMENT
-        return tag.fillSlots(value="sample value")
+        propval = yield self.principalResource.readProperty(
+            (self.namespace, self.name), request
+        )
+        returnValue(tag.fillSlots(value=propval.toxml()))
 
 
     @renderer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/b0db936d/attachment.html>


More information about the calendarserver-changes mailing list