Use SlotsSequenceElement to render servers with corrupt shares

This commit is contained in:
Sajith Sasidharan 2020-06-15 13:34:11 -04:00
parent c41bca24f5
commit 46cb3b6bc3
2 changed files with 12 additions and 13 deletions

View File

@ -536,24 +536,23 @@ class DeepCheckResultsRendererElement(Element, ResultsBase, ReloadMixin):
return tag return tag
return "" return ""
# TODO: use SlotsSequenceElement to render this.
@renderer @renderer
def servers_with_corrupt_shares(self, ctx, data): def servers_with_corrupt_shares(self, ctx, data):
servers = [s servers = [s
for (s, storage_index, sharenum) for (s, storage_index, sharenum)
in self.monitor.get_status().get_corrupt_shares()] in self.monitor.get_status().get_corrupt_shares()]
servers.sort(key=lambda s: s.get_longname()) servers.sort(key=lambda s: s.get_longname())
return servers
@renderer problems = []
def server_problem(self, req, tag):
# def server_problem(self, ctx, server): for server in servers:
# TODO: where do `server` come from now? name = [server.get_name()]
data = [server.get_name()] nick = server.get_nickname()
nickname = server.get_nickname() if nick:
if nickname: name.append(" (%s)" % self._html(nickname))
data.append(" (%s)" % self._html(nickname)) problems.append(name)
return tag(data)
return SlotsSequenceElement(tag, problems)
@renderer @renderer
def corrupt_shares_p(self, req, tag): def corrupt_shares_p(self, req, tag):

View File

@ -34,8 +34,8 @@
<div t:render="servers_with_corrupt_shares_p"> <div t:render="servers_with_corrupt_shares_p">
<h2>Servers on which corrupt shares were found</h2> <h2>Servers on which corrupt shares were found</h2>
<ul t:render="servers_with_corrupt_shares"> <ul t:render="servers_with_corrupt_shares">
<li t:pattern="item" t:render="server_problem"/> <li t:render="item"/>
<li t:pattern="empty">None</li> <li t:render="empty">None</li>
</ul> </ul>
</div> </div>