[CalendarServer-changes] [12684] CalendarServer/trunk/calendarserver/webadmin
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:21:18 PDT 2014
Revision: 12684
http://trac.calendarserver.org//changeset/12684
Author: wsanchez at apple.com
Date: 2014-02-12 14:43:45 -0800 (Wed, 12 Feb 2014)
Log Message:
-----------
Add record details
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-12 21:28:22 UTC (rev 12683)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-12 22:43:45 UTC (rev 12684)
@@ -45,7 +45,7 @@
def pageSlots(self):
return {
- u"title": u"Calendar & Contacts Server Principal Management",
+ u"title": u"Calendar & Contacts Server Principal Search",
}
@@ -122,8 +122,42 @@
def pageSlots(self):
+ record = self._record
+
+ def one(value):
+ if value is None:
+ return u"(no value)"
+ else:
+ return unicode(value)
+
+ def many(values):
+ noValues = True
+
+ for value in values:
+ if not noValues:
+ yield tags.br()
+
+ yield one(value)
+
+ noValues = False
+
+ if noValues:
+ yield u"(no values)"
+
return {
- u"title": u"Calendar & Contacts Server Principal Edit",
+ 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),
}
Modified: CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2014-02-12 21:28:22 UTC (rev 12683)
+++ CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2014-02-12 22:43:45 UTC (rev 12684)
@@ -3,13 +3,70 @@
<head>
<title><t:slot name="title" /></title>
+
<link t:render="stylesheet" />
+ <style>
+
+ table.record {
+ margin-left: auto;
+ margin-right: auto;
+ width: auto;
+ }
+
+ </style>
</head>
<body>
<h1><t:slot name="title" /></h1>
+ <table class="record">
+ <caption>Record Information</caption>
+ <thead>
+ <tr>
+ <th>Field Name</th>
+ <th>Field Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Directory Service</td>
+ <td><t:slot name="service" /></td>
+ </tr>
+ <tr>
+ <td>UID</td>
+ <td><t:slot name="uid" /></td>
+ </tr>
+ <tr>
+ <td>GUID</td>
+ <td><t:slot name="guid" /></td>
+ </tr>
+ <tr>
+ <td>Record Type</td>
+ <td><t:slot name="record_type" /></td>
+ </tr>
+ <tr>
+ <td>Short Names</td>
+ <td><t:slot name="short_names" /></td>
+ </tr>
+ <tr>
+ <td>Full Names</td>
+ <td><t:slot name="full_names" /></td>
+ </tr>
+ <tr>
+ <td>Email Addresses</td>
+ <td><t:slot name="email_addresses" /></td>
+ </tr>
+ <tr>
+ <td>Calendar User Addresses</td>
+ <td><t:slot name="calendar_user_addresses" /></td>
+ </tr>
+ <tr>
+ <td>Server ID</td>
+ <td><t:slot name="server_id" /></td>
+ </tr>
+ </tbody>
+ </table>
</body>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/fd7d6ffb/attachment.html>
More information about the calendarserver-changes
mailing list