<!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>[12690] 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/12690">12690</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-13 17:28:27 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use more template and less code.</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 (12689 => 12690)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-13 22:14:57 UTC (rev 12689)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-14 01:28:27 UTC (rev 12690)
</span><span class="lines">@@ -50,7 +50,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @renderer
</span><del>- def search_value(self, request, tag):
</del><ins>+ def search_terms(self, request, tag):
+ """
+ Inserts search terms as a text child of C{tag}.
+ """
</ins><span class="cx"> terms = searchTerms(request)
</span><span class="cx"> if terms:
</span><span class="cx"> return tag(value=u" ".join(terms))
</span><span class="lines">@@ -59,28 +62,40 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @renderer
</span><del>- @inlineCallbacks
- def search_results(self, request, tag):
- terms = searchTerms(request)
</del><ins>+ def search_results_display(self, request, tag):
+ """
+ Renders C{tag} if there are search results, otherwise removes it.
+ """
+ if searchTerms(request):
+ return tag
+ else:
+ return u""
</ins><span class="cx">
</span><del>- if not terms:
- returnValue(u"")
</del><span class="cx">
</span><del>- records = tuple((
- yield self.recordsForSearchTerms(terms)
- ))
</del><ins>+ @renderer
+ def search_results_row(self, request, tag):
+ def rowsForRecords(records):
+ for record in records:
+ yield tag.clone().fillSlots(
+ **slotsForRecord(record)
+ )
</ins><span class="cx">
</span><del>- if records:
- returnValue(tag(recordsTable(records)))
- else:
- returnValue(tag(u"No records found."))
</del><ins>+ d = self.recordsForSearchTerms(request)
+ d.addCallback(rowsForRecords)
+ return d
</ins><span class="cx">
</span><span class="cx">
</span><del>- def recordsForSearchTerms(self, terms):
- return self._directory.recordsMatchingTokens(terms)
</del><ins>+ @inlineCallbacks
+ def recordsForSearchTerms(self, request):
+ if not hasattr(request, "_search_result_records"):
+ terms = searchTerms(request)
+ records = yield self._directory.recordsMatchingTokens(terms)
+ request._search_result_records = tuple(records)
</ins><span class="cx">
</span><ins>+ returnValue(request._search_result_records)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class PrincipalsResource(TemplateResource):
</span><span class="cx"> """
</span><span class="cx"> Principal management page resource.
</span><span class="lines">@@ -178,86 +193,64 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def searchTerms(request):
</span><del>- if request.args:
</del><ins>+ if not hasattr(request, "_search_terms"):
</ins><span class="cx"> terms = set()
</span><span class="cx">
</span><del>- for query in request.args.get(u"search", []):
- for term in query.split(u" "):
- terms.add(term)
</del><ins>+ if request.args:
</ins><span class="cx">
</span><del>- for term in request.args.get(u"term", []):
- terms.add(term)
</del><ins>+ for query in request.args.get(u"search", []):
+ for term in query.split(u" "):
+ if term:
+ terms.add(term)
</ins><span class="cx">
</span><del>- return terms
</del><ins>+ for term in request.args.get(u"term", []):
+ if term:
+ terms.add(term)
</ins><span class="cx">
</span><del>- else:
- return set()
</del><ins>+ request._search_terms = terms
</ins><span class="cx">
</span><ins>+ return request._search_terms
</ins><span class="cx">
</span><span class="cx">
</span><del>-def recordsTable(records):
- def multiValue(values):
- return ((s, tags.br()) for s in values)
</del><span class="cx">
</span><del>- 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"}
</del><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)"
</ins><span class="cx">
</span><del>- i0 = u"\n" + (6 * u" ") + (0 * 2 * u" ")
- i1 = u"\n" + (6 * u" ") + (1 * 2 * u" ")
- i2 = u"\n" + (6 * u" ") + (2 * 2 * u" ")
</del><ins>+ def many(values):
+ noValues = True
</ins><span class="cx">
</span><del>- 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,
- )
</del><ins>+ for value in values:
+ if not noValues:
+ yield tags.br()
</ins><span class="cx">
</span><del>- 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,
- onclick=(
- 'window.open("./{0}");'
- .format(record.uid)
- ),
- **attrs_record
- ),
- )
- for record in sorted(records, key=lambda record: record.uid)
- ),
- i0
- )
</del><ins>+ yield one(value)
</ins><span class="cx">
</span><del>- return tags.table(
- tags.caption(u"Records"),
- recordRows(records),
- id="records",
- )
</del><ins>+ 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 (12689 => 12690)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2014-02-13 22:14:57 UTC (rev 12689)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2014-02-14 01:28:27 UTC (rev 12690)
</span><span class="lines">@@ -17,10 +17,30 @@
</span><span class="cx">
</span><span class="cx"> <form id="search_form" action="" method="get">
</span><span class="cx"> Search:
</span><del>- <input id="search_field" type="search" name="search" placeholder="Search..." size="40" autofocus="true" t:render="search_value" />
</del><ins>+ <input id="search_field" type="search" name="search" placeholder="Search..." size="40" autofocus="true" t:render="search_terms" />
</ins><span class="cx"> </form>
</span><span class="cx">
</span><del>- <div t:render="search_results" />
</del><ins>+ <table id="records" t:render="search_results_display">
+ <caption>Records</caption>
+ <thead>
+ <tr class="record">
+ <th class="record_full_name">Full name</th>
+ <th class="record_uid">UID</th>
+ <th class="record_type">Record Type</th>
+ <th class="record_short_name">Short Name</th>
+ <th class="record_email">Email Address</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr class="record" onclick="window.open(&quot;./0CE0BF31-5F9E-4801-A489-8C70CF287F5F&quot;);" t:render="search_results_row">
+ <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>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx">
</span><span class="cx"> </body>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>