Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI cleanup follow up from #3245. #3251

Merged
merged 3 commits into from
Jul 10, 2017
Merged

UI cleanup follow up from #3245. #3251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8daa909
Removes unnecessary set for model component which will be null.
slackpad Jul 10, 2017
4799193
Returns a 404 for a missing node, not a 200 with an empty response.
slackpad Jul 10, 2017
caf2a81
Updates built-in web assets.
slackpad Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions agent/ui_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ RPC:
info.Checks = make([]*structs.HealthCheck, 0)
}
return info, nil
} else {
resp.WriteHeader(http.StatusNotFound)
return nil, nil
}

return nil, nil
}

Expand Down
6 changes: 0 additions & 6 deletions ui/javascripts/app/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,6 @@ App.NodesShowRoute = App.BaseRoute.extend({
controller.set('content', models.node);
controller.set('sessions', models.sessions);
controller.set('tomography', models.tomography);
//
// Since we have 2 column layout, we need to also display the
// list of nodes on the left. Hence setting the attribute
// {{nodes}} on the controller.
//
controller.set('nodes', models.nodes);
}
});

Expand Down