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

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:19:55 PDT 2014


Revision: 12693
          http://trac.calendarserver.org//changeset/12693
Author:   wsanchez at apple.com
Date:     2014-02-13 18:15:11 -0800 (Thu, 13 Feb 2014)
Log Message:
-----------
Rework slots logic a bit

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

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py	2014-02-14 02:12:08 UTC (rev 12692)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py	2014-02-14 02:15:11 UTC (rev 12693)
@@ -137,46 +137,17 @@
 
 
     def pageSlots(self):
-        record = self._record
+        slots = slotsForRecord(self._record)
 
-        def one(value):
-            if value is None:
-                return u"(no value)"
-            else:
-                return unicode(value)
+        slots[u"title"] = u"Calendar & Contacts Server Principal Information"
+        slots[u"service"] = (
+            u"{self._record.service.__class__.__name__}: "
+            "{self._record.service.realmName}"
+            .format(self=self)
+        )
 
-        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"title": u"Calendar & Contacts Server Principal Information",
-            u"service": (
-                u"{service.__class__.__name__}: {service.realmName}"
-                .format(service=record.service)
-            ),
-            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),
-        }
-
-
-
 class PrincipalEditResource(TemplateResource):
     """
     Principal editing resource.

Modified: CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml	2014-02-14 02:12:08 UTC (rev 12692)
+++ CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml	2014-02-14 02:15:11 UTC (rev 12693)
@@ -43,27 +43,27 @@
         </tr>
         <tr>
           <td>Record Type</td>
-          <td><t:slot name="record_type" /></td>
+          <td><t:slot name="recordType" /></td>
         </tr>
         <tr>
           <td>Short Names</td>
-          <td><t:slot name="short_names" /></td>
+          <td><t:slot name="shortNames" /></td>
         </tr>
         <tr>
           <td>Full Names</td>
-          <td><t:slot name="full_names" /></td>
+          <td><t:slot name="fullNames" /></td>
         </tr>
         <tr>
           <td>Email Addresses</td>
-          <td><t:slot name="email_addresses" /></td>
+          <td><t:slot name="emailAddresses" /></td>
         </tr>
         <tr>
           <td>Calendar User Addresses</td>
-          <td><t:slot name="calendar_user_addresses" /></td>
+          <td><t:slot name="calendarUserAddresses" /></td>
         </tr>
         <tr>
           <td>Server ID</td>
-          <td><t:slot name="server_id" /></td>
+          <td><t:slot name="serverID" /></td>
         </tr>
         <!--
         <tr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/8bdf012d/attachment.html>


More information about the calendarserver-changes mailing list