<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12692] CalendarServer/trunk/calendarserver/webadmin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12692">12692</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-13 18:12:08 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rework slots logic a bit</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalspy">CalendarServer/trunk/calendarserver/webadmin/principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalsxhtml">CalendarServer/trunk/calendarserver/webadmin/principals.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py (12691 => 12692)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-14 01:40:49 UTC (rev 12691)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-14 02:12:08 UTC (rev 12692)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twisted.web.template import tags, renderer
</del><ins>+from twisted.web.template import tags as html, renderer
</ins><span class="cx">
</span><span class="cx"> from .resource import PageElement, TemplateResource
</span><span class="cx">
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> for value in values:
</span><span class="cx"> if not noValues:
</span><del>- yield tags.br()
</del><ins>+ yield html.br()
</ins><span class="cx">
</span><span class="cx"> yield one(value)
</span><span class="cx">
</span><span class="lines">@@ -212,45 +212,102 @@
</span><span class="cx"> return request._search_terms
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><ins>+#
+# This should work when we switch to twext.who
+#
</ins><span class="cx"> def slotsForRecord(record):
</span><del>- def one(value):
- if value is None:
</del><ins>+ def asText(obj):
+ if obj is None:
</ins><span class="cx"> return u"(no value)"
</span><span class="cx"> else:
</span><span class="cx"> try:
</span><del>- return unicode(value)
</del><ins>+ return unicode(obj)
</ins><span class="cx"> except UnicodeDecodeError:
</span><span class="cx"> try:
</span><del>- return unicode(repr(value))
</del><ins>+ return unicode(repr(obj))
</ins><span class="cx"> except UnicodeDecodeError:
</span><span class="cx"> return u"(error rendering value)"
</span><span class="cx">
</span><del>- def many(values):
</del><ins>+ def joinWithBR(elements):
</ins><span class="cx"> noValues = True
</span><span class="cx">
</span><del>- for value in values:
</del><ins>+ for element in elements:
</ins><span class="cx"> if not noValues:
</span><del>- yield tags.br()
</del><ins>+ yield html.br()
</ins><span class="cx">
</span><del>- yield one(value)
</del><ins>+ yield asText(element)
</ins><span class="cx">
</span><span class="cx"> noValues = False
</span><span class="cx">
</span><span class="cx"> if noValues:
</span><span class="cx"> yield u"(no values)"
</span><span class="cx">
</span><ins>+
+ # slots = {}
+
+ # for field, values in record.fields.iteritems():
+ # if not record.service.fieldName.isMultiValue(field):
+ # values = (values,)
+
+ # slots[field.name] = joinWithBR(asText(value) for value in values)
+
+ # return slots
+
</ins><span class="cx"> return {
</span><span class="cx"> u"service": (
</span><span class="cx"> u"{record.service.__class__.__name__}: {record.service.realmName}"
</span><span class="cx"> .format(record=record)
</span><span class="cx"> ),
</span><del>- 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),
</del><ins>+ u"uid": joinWithBR((record.uid,)),
+ u"guid": joinWithBR((record.guid,)),
+ u"recordType": joinWithBR((record.recordType,)),
+ u"shortNames": joinWithBR(record.shortNames),
+ u"fullNames": joinWithBR((record.fullName,)),
+ u"emailAddresses": joinWithBR(record.emailAddresses),
+ u"calendarUserAddresses": joinWithBR(record.calendarUserAddresses),
+ u"serverID": joinWithBR((record.serverID,)),
</ins><span class="cx"> }
</span><ins>+
+
+
+# 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),
+# }
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminprincipalsxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals.xhtml (12691 => 12692)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2014-02-14 01:40:49 UTC (rev 12691)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2014-02-14 02:12:08 UTC (rev 12692)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> <thead>
</span><span class="cx"> <tr class="record">
</span><span class="cx"> <th class="record_full_name">Full name</th>
</span><del>- <th class="record_uid">UID</th>
</del><span class="cx"> <th class="record_type">Record Type</th>
</span><span class="cx"> <th class="record_short_name">Short Name</th>
</span><span class="cx"> <th class="record_email">Email Address</th>
</span><span class="lines">@@ -33,11 +32,10 @@
</span><span class="cx"> </thead>
</span><span class="cx"> <tbody>
</span><span class="cx"> <tr class="record" t:render="search_results_row"><t:attr name="onclick">window.open("./<t:slot name="uid" />");</t:attr>
</span><del>- <td class="record_full_name"><t:slot name="full_names" /></td>
- <td class="record_uid"><t:slot name="uid" /></td>
- <td class="record_type"><t:slot name="record_type" /></td>
- <td class="record_short_name"><t:slot name="short_names" /></td>
- <td class="record_email"><t:slot name="email_addresses" /></td>
</del><ins>+ <td class="record_full_name"><t:slot name="fullNames" /></td>
+ <td class="record_type"><t:slot name="recordType" /></td>
+ <td class="record_short_name"><t:slot name="shortNames" /></td>
+ <td class="record_email"><t:slot name="emailAddresses" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>