[CalendarServer-changes] [12694] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 12694
          http://trac.calendarserver.org//changeset/12694
Author:   wsanchez at apple.com
Date:     2014-02-13 18:19:36 -0800 (Thu, 13 Feb 2014)
Log Message:
-----------
Use new slots thingo in edit page

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/principals.py
    CalendarServer/trunk/calendarserver/webadmin/principals.xhtml

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py	2014-02-14 02:15:11 UTC (rev 12693)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py	2014-02-14 02:19:36 UTC (rev 12694)
@@ -62,7 +62,7 @@
 
 
     @renderer
-    def search_results_display(self, request, tag):
+    def if_search_results(self, request, tag):
         """
         Renders C{tag} if there are search results, otherwise removes it.
         """
@@ -146,8 +146,10 @@
             .format(self=self)
         )
 
+        return slots
 
 
+
 class PrincipalEditResource(TemplateResource):
     """
     Principal editing resource.
@@ -238,47 +240,3 @@
         u"calendarUserAddresses": joinWithBR(record.calendarUserAddresses),
         u"serverID": joinWithBR((record.serverID,)),
     }
-
-
-
-# def slotsForRecord(record):
-#     def one(value):
-#         if value is None:
-#             return u"(no value)"
-#         else:
-#             try:
-#                 return unicode(value)
-#             except UnicodeDecodeError:
-#                 try:
-#                     return unicode(repr(value))
-#                 except UnicodeDecodeError:
-#                     return u"(error rendering value)"
-
-#     def many(values):
-#         noValues = True
-
-#         for value in values:
-#             if not noValues:
-#                 yield html.br()
-
-#             yield one(value)
-
-#             noValues = False
-
-#         if noValues:
-#             yield u"(no values)"
-
-#     return {
-#         u"service": (
-#             u"{record.service.__class__.__name__}: {record.service.realmName}"
-#             .format(record=record)
-#         ),
-#         u"uid": one(record.uid),
-#         u"guid": one(record.guid),
-#         u"record_type": one(record.recordType),
-#         u"short_names": many(record.shortNames),
-#         u"full_names": one(record.fullName),
-#         u"email_addresses": many(record.emailAddresses),
-#         u"calendar_user_addresses": many(record.calendarUserAddresses),
-#         u"server_id": one(record.serverID),
-#     }

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml	2014-02-14 02:15:11 UTC (rev 12693)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml	2014-02-14 02:19:36 UTC (rev 12694)
@@ -20,7 +20,7 @@
       <input id="search_field" type="search" name="search" placeholder="Search..." size="40" autofocus="true" t:render="search_terms" />
     </form>
 
-    <table id="records" t:render="search_results_display">
+    <table id="records" t:render="if_search_results">
       <caption>Records</caption>
       <thead>
         <tr class="record">
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/f2cf3803/attachment.html>