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

[source_changes at macosforge.org]

Revision: 7977
          http://trac.macosforge.org/projects/calendarserver/changeset/7977
Author:   glyph at apple.com
Date:     2011-08-11 21:54:45 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
don't display property stuff when a property isn't requested.

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:34 UTC (rev 7976)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:54:45 UTC (rev 7977)
@@ -211,7 +211,10 @@
         except Exception:
             self.namespace = None
             self.name = None
-            self.error = davPropertyName
+            if davPropertyName:
+                self.error = davPropertyName
+            else:
+                self.error = None
         else:
             self.namespace = namespace
             self.name = name
@@ -239,7 +242,7 @@
         Renderer to display an error when the user specifies an invalid property
         name.
         """
-        if self.error is None:
+        if self.name is not None:
             try:
                 propval = yield self.principalResource.readProperty(
                     (self.namespace, self.name), request

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:34 UTC (rev 7976)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:54:45 UTC (rev 7977)
@@ -253,6 +253,9 @@
         self.assertNotIn("No matches found for resource",
                          gatherTextNodes(document))
         self.assertIdentical(document.getElementById("tab_searchResults"), None)
+        # I'm not attempting to retrieve a property, there's nothing to fail to
+        # parse.
+        self.assertNotIn("Unable to parse property", gatherTextNodes(document))
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/761cf517/attachment.html>