<!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>[12672] CalendarServer/trunk/calendarserver/webadmin/principals.py</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/12672">12672</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 00:12:01 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add results table data</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalspy">CalendarServer/trunk/calendarserver/webadmin/principals.py</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 (12671 => 12672)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.py        2014-02-12 07:04:30 UTC (rev 12671)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py        2014-02-12 08:12:01 UTC (rev 12672)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, directory):
</span><del>- PageElement.__init__(self, "principals")
</del><ins>+ PageElement.__init__(self, u"principals")
</ins><span class="cx">
</span><span class="cx"> self._directory = directory
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> def search_value(self, request, tag):
</span><span class="cx"> terms = searchTerms(request)
</span><span class="cx"> if terms:
</span><del>- return tag(value=" ".join(terms))
</del><ins>+ return tag(value=u" ".join(terms))
</ins><span class="cx"> else:
</span><span class="cx"> return tag
</span><span class="cx">
</span><span class="lines">@@ -100,11 +100,11 @@
</span><span class="cx"> if request.args:
</span><span class="cx"> terms = set()
</span><span class="cx">
</span><del>- for query in request.args.get("search", []):
- for term in query.split(" "):
</del><ins>+ for query in request.args.get(u"search", []):
+ for term in query.split(u" "):
</ins><span class="cx"> terms.add(term)
</span><span class="cx">
</span><del>- for term in request.args.get("term", []):
</del><ins>+ for term in request.args.get(u"term", []):
</ins><span class="cx"> terms.add(term)
</span><span class="cx">
</span><span class="cx"> return terms
</span><span class="lines">@@ -115,6 +115,64 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def recordsTable(records):
</span><ins>+ def multiValue(values):
+ return ((s, tags.br()) for s in values)
+
+ def recordRows(records):
+ attrs_record = {"class": "record"}
+ attrs_fullName = {"class": "record_full_name"}
+ attrs_uid = {"class": "record_uid"}
+ attrs_recordType = {"class": "record_type"}
+ attrs_shortName = {"class": "record_short_name"}
+ attrs_email = {"class": "record_email"}
+
+ i0 = u"\n" + (6 * u" ") + (0 * 2 * u" ")
+ i1 = u"\n" + (6 * u" ") + (1 * 2 * u" ")
+ i2 = u"\n" + (6 * u" ") + (2 * 2 * u" ")
+
+ yield (
+ i0,
+ tags.thead(
+ i1,
+ tags.tr(
+ i2, tags.th(u"Full name", **attrs_fullName),
+ i2, tags.th(u"UID", **attrs_uid),
+ i2, tags.th(u"Record Type", **attrs_recordType),
+ i2, tags.th(u"Short Name", **attrs_shortName),
+ i2, tags.th(u"Email Address", **attrs_email),
+ i1,
+ **attrs_record
+ ),
+ i0,
+ ),
+ i0,
+ )
+
+ yield (
+ tags.tbody(
+ (
+ i1,
+ tags.tr(
+ i2, tags.td(record.fullName, **attrs_fullName),
+ i2, tags.td(record.uid, **attrs_uid),
+ i2, tags.td(record.recordType, **attrs_recordType),
+ i2, tags.td(
+ multiValue(record.shortNames), **attrs_shortName
+ ),
+ i2, tags.td(
+ multiValue(record.emailAddresses), **attrs_email
+ ),
+ i1,
+ **attrs_record
+ ),
+ )
+ for record in sorted(records, key=lambda record: record.uid)
+ ),
+ i0
+ )
+
</ins><span class="cx"> return tags.table(
</span><span class="cx"> tags.caption(u"Records"),
</span><ins>+ recordRows(records),
+ id="records",
</ins><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>