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

[source_changes at macosforge.org]

Revision: 7952
          http://trac.macosforge.org/projects/calendarserver/changeset/7952
Author:   glyph at apple.com
Date:     2011-08-11 21:49:49 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
fix tests for error handling, and fix tag hierarchy to correspond to slot scoping

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

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:49:37 UTC (rev 7951)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:49:49 UTC (rev 7952)
@@ -194,11 +194,11 @@
         except Exception:
             self.namespace = None
             self.name = None
-            self.error = True
+            self.error = davPropertyName
         else:
             self.namespace = namespace
             self.name = name
-            self.error = False
+            self.error = None
 
         super(DetailsElement, self).__init__(loader=stan(tag))
 
@@ -209,10 +209,10 @@
         Renderer to display an error when the user specifies an invalid property
         name.
         """
-        if not self.error:
+        if self.error is None:
             return ""
-        # FIXME IMPLEMENT
-        return tag
+        else:
+            return tag.fillSlots(davPropertyName=self.error)
 
 
     @renderer
@@ -222,10 +222,13 @@
         Renderer to display an error when the user specifies an invalid property
         name.
         """
-        propval = yield self.principalResource.readProperty(
-            (self.namespace, self.name), request
-        )
-        returnValue(tag.fillSlots(value=propval.toxml()))
+        if self.error is None:
+            propval = yield self.principalResource.readProperty(
+                (self.namespace, self.name), request
+            )
+            returnValue(tag.fillSlots(value=propval.toxml()))
+        else:
+            returnValue("")
 
 
     @renderer

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html	2011-08-12 04:49:37 UTC (rev 7951)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html	2011-08-12 04:49:49 UTC (rev 7952)
@@ -104,12 +104,15 @@
         <input type="submit" value="Get Value" />
       </form>
 
-      <div t:render="propertyParseError">Unable to parse property to read:
-        <b><t:slot name="davPropertyName" /></b></div>
+      <div t:render="propertyParseError">
+      Unable to parse property to read: <b><t:slot name="davPropertyName" /></b>
+      </div>
 
-      <div t:render="davProperty" style="margin-top: 7px">Value of property
+      <t:invisible t:render="davProperty">
+      <div style="margin-top: 7px">Value of property
         <b><t:slot name="davPropertyName" /></b>:</div>
       <pre style="margin-top:5px; padding-top:0"><t:slot name="value" /></pre>
+      </t:invisible>
 
       <!-- autoScheduleHtml -->
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/803215f5/attachment-0001.html>