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

[source_changes at macosforge.org]

Revision: 7983
          http://trac.macosforge.org/projects/calendarserver/changeset/7983
Author:   glyph at apple.com
Date:     2011-08-11 21:55:51 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
tweak proxies display

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:55:39 UTC (rev 7982)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:55:51 UTC (rev 7983)
@@ -326,15 +326,15 @@
                 def getres(ref):
                     return self.adminResource.getResourceById(request,
                                                               str(proxyHRef))
-                for proxyHRef in readMembers.children:
+                for proxyHRef in sorted(readMembers.children, key=str):
                     readProxies.append((yield getres(proxyHRef)))
-                for proxyHRef in writeMembers.children:
+                for proxyHRef in sorted(writeMembers.children, key=str):
                     writeProxies.append((yield getres(proxyHRef)))
                 lendiff = len(readProxies) - len(writeProxies)
                 if lendiff > 0:
                     writeProxies += [None] * lendiff
                 elif lendiff < 0:
-                    readProxies += [None] * lendiff
+                    readProxies += [None] * -lendiff
                 self._matrix = zip(readProxies, writeProxies)
             else:
                 self._matrix = []
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/23f989c5/attachment.html>