<!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>[15487] 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/15487">15487</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-03-30 10:23:17 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the webadmin breakage</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminconfigpy">CalendarServer/trunk/calendarserver/webadmin/config.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminlandingpy">CalendarServer/trunk/calendarserver/webadmin/landing.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminlandingxhtml">CalendarServer/trunk/calendarserver/webadmin/landing.xhtml</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalsxhtml">CalendarServer/trunk/calendarserver/webadmin/principals.xhtml</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipals_editxhtml">CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/config.py (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/config.py 2016-03-28 16:17:46 UTC (rev 15486)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py 2016-03-30 17:23:17 UTC (rev 15487)
</span><span class="lines">@@ -95,11 +95,14 @@
</span><span class="cx"> return html.code(unicode(value))
</span><span class="cx">
</span><span class="cx"> if isinstance(value, list):
</span><del>- result = []
- for item in value:
- result.append(describe(item))
- result.append(html.br())
- result.pop()
</del><ins>+ if len(value) == 0:
+ result = u"(empty list)"
+ else:
+ result = []
+ for item in value:
+ result.append(describe(item))
+ result.append(html.br())
+ result.pop()
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> result = describe(value)
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlandingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/landing.py 2016-03-28 16:17:46 UTC (rev 15486)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py 2016-03-30 17:23:17 UTC (rev 15487)
</span><span class="lines">@@ -65,48 +65,48 @@
</span><span class="cx"> # self._root = root
</span><span class="cx"> # self._principalCollections = principalCollections
</span><span class="cx">
</span><del>- # from .config import ConfigurationResource
- # self.putChild(u"config", ConfigurationResource(configuration, principalCollections))
</del><ins>+ from .config import ConfigurationResource
+ self.putChild(u"config", ConfigurationResource(configuration, principalCollections))
</ins><span class="cx">
</span><del>- # from .principals import PrincipalsResource
- # self.putChild(u"principals", PrincipalsResource(directory, store, principalCollections))
</del><ins>+ from .principals import PrincipalsResource
+ self.putChild(u"principals", PrincipalsResource(directory, store, principalCollections))
</ins><span class="cx">
</span><del>- # from .logs import LogsResource
- # self.putChild(u"logs", LogsResource())
</del><ins>+ from .logs import LogsResource
+ self.putChild(u"logs", LogsResource(principalCollections))
</ins><span class="cx">
</span><span class="cx"> # from .work import WorkMonitorResource
</span><span class="cx"> # self.putChild(u"work", WorkMonitorResource(store))
</span><span class="cx">
</span><span class="cx">
</span><del>- def getChild(self, name):
- bound = super(WebAdminLandingResource, self).getChild(name)
</del><ins>+ # def getChild(self, name):
+ # bound = super(WebAdminLandingResource, self).getChild(name)
</ins><span class="cx">
</span><del>- if bound is not None:
- return bound
</del><ins>+ # if bound is not None:
+ # return bound
</ins><span class="cx">
</span><del>- #
- # Dynamically load and vend child resources not bound using putChild()
- # in __init__(). This is useful for development, since it allows one
- # to comment out the putChild() call above, and then code will be
- # re-loaded for each request.
- #
</del><ins>+ # #
+ # # Dynamically load and vend child resources not bound using putChild()
+ # # in __init__(). This is useful for development, since it allows one
+ # # to comment out the putChild() call above, and then code will be
+ # # re-loaded for each request.
+ # #
</ins><span class="cx">
</span><del>- from . import config, principals, logs, work
</del><ins>+ # from . import config, principals, logs, work
</ins><span class="cx">
</span><del>- if name == u"config":
- reload(config)
- return config.ConfigurationResource(self.configuration, self._principalCollections)
</del><ins>+ # if name == u"config":
+ # reload(config)
+ # return config.ConfigurationResource(self.configuration, self._principalCollections)
</ins><span class="cx">
</span><del>- elif name == u"principals":
- reload(principals)
- return principals.PrincipalsResource(self.directory, self.store, self._principalCollections)
</del><ins>+ # elif name == u"principals":
+ # reload(principals)
+ # return principals.PrincipalsResource(self.directory, self.store, self._principalCollections)
</ins><span class="cx">
</span><del>- elif name == u"logs":
- reload(logs)
- return logs.LogsResource(self._principalCollections)
</del><ins>+ # elif name == u"logs":
+ # reload(logs)
+ # return logs.LogsResource(self._principalCollections)
</ins><span class="cx">
</span><del>- elif name == u"work":
- reload(work)
- return work.WorkMonitorResource(self.store, self._principalCollections)
</del><ins>+ # elif name == u"work":
+ # reload(work)
+ # return work.WorkMonitorResource(self.store, self._principalCollections)
</ins><span class="cx">
</span><del>- return None
</del><ins>+ # return None
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlandingxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/landing.xhtml (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/landing.xhtml 2016-03-28 16:17:46 UTC (rev 15486)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.xhtml 2016-03-30 17:23:17 UTC (rev 15487)
</span><span class="lines">@@ -15,11 +15,6 @@
</span><span class="cx"> <li><a href="principals">Principal Management</a></li>
</span><span class="cx"> </ul>
</span><span class="cx">
</span><del>- <ul>
- <li><a href="logs">Server Logs</a></li>
- <li><a href="work">Workload Monitor</a></li>
- </ul>
-
</del><span class="cx"> </body>
</span><span class="cx">
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminprincipalsxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals.xhtml (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2016-03-28 16:17:46 UTC (rev 15486)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2016-03-30 17:23:17 UTC (rev 15487)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> </thead>
</span><span class="cx"> <tbody>
</span><span class="cx"> <tr class="record" t:render="search_results_row">
</span><del>- <t:attr name="onclick">window.open("./<t:slot name="uid" />");</t:attr>
</del><ins>+ <t:attr name="onclick">window.open("/admin/principals/<t:slot name="uid" />");</t:attr>
</ins><span class="cx"> <td class="record_full_name"><t:slot name="fullNames" /></td>
</span><span class="cx"> <td class="record_type"><t:slot name="recordType" /></td>
</span><span class="cx"> <td class="record_short_name"><t:slot name="shortNames" /></td>
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminprincipals_editxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2016-03-28 16:17:46 UTC (rev 15486)
+++ CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2016-03-30 17:23:17 UTC (rev 15487)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <td>Server ID</td>
</span><del>- <td><t:slot name="serverID" /></td>
</del><ins>+ <td><t:slot name="serverURI" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <!--
</span><span class="cx"> <tr>
</span></span></pre>
</div>
</div>
</body>
</html>