| Index: appengine/swarming/elements/res/imp/botlist/bot-list.html
|
| diff --git a/appengine/swarming/elements/res/imp/botlist/bot-list.html b/appengine/swarming/elements/res/imp/botlist/bot-list.html
|
| index 14ae82a352c9366aa465d674c8ab5272fbcc2a88..6462b9fc069a95ef8ae6d73b9c3fa36721dc0292 100644
|
| --- a/appengine/swarming/elements/res/imp/botlist/bot-list.html
|
| +++ b/appengine/swarming/elements/res/imp/botlist/bot-list.html
|
| @@ -65,7 +65,6 @@
|
| client_id="[[client_id]]"
|
| auth_headers="{{_auth_headers}}"
|
| signed_in="{{_signed_in}}"
|
| -
|
| busy="[[_busy]]"
|
| name="Swarming Bot List">
|
|
|
| @@ -302,7 +301,13 @@
|
| " ago";
|
| }
|
| if (bot.quarantined) {
|
| - return "Quarantined: " + this._attribute(bot, "quarantined");
|
| + var msg = this._state(bot, "quarantined")[0];
|
| + // Sometimes, the quarantined message is actually in "error". This
|
| + // happens when the bot code has thrown an exception.
|
| + if (msg === "unknown" || msg === "true" || msg === true) {
|
| + msg = this._attribute(bot, "error");
|
| + }
|
| + return "Quarantined: " + msg;
|
| }
|
| return "Alive";
|
| },
|
| @@ -352,8 +357,13 @@
|
|
|
| Polymer({
|
| is: 'bot-list',
|
| - behaviors: [SwarmingBehaviors.BotListBehavior,
|
| - SwarmingBehaviors.DynamicTableBehavior],
|
| +
|
| + // The order behaviors are applied in matters - later ones overwrite
|
| + // attributes of earlier ones
|
| + behaviors: [
|
| + SwarmingBehaviors.BotListBehavior,
|
| + SwarmingBehaviors.DynamicTableBehavior,
|
| + ],
|
|
|
| properties: {
|
| client_id: {
|
|
|