This closes #704
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/772ec021 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/772ec021 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/772ec021 Branch: refs/heads/master Commit: 772ec021dcc30f6d18690d3afbce5f8766b08e04 Parents: d496393 3388fde Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 00:34:59 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:34:59 2015 -0700 ---------------------------------------------------------------------- .../catalog/internal/BasicBrooklynCatalog.java | 4 ++ .../assets/js/model/catalog-item-summary.js | 7 +-- .../src/main/webapp/assets/js/model/location.js | 6 +++ .../src/main/webapp/assets/js/view/catalog.js | 46 +++++++++++++++++--- .../assets/tpl/catalog/details-entity.html | 5 +++ .../assets/tpl/catalog/details-generic.html | 4 ++ .../assets/tpl/catalog/details-location.html | 22 ++++++---- .../main/java/brooklyn/rest/api/CatalogApi.java | 13 ++++++ .../rest/resources/CatalogResource.java | 5 +++ .../rest/resources/LocationResource.java | 34 +++++++++++++-- .../rest/resources/ApiDocResourceTest.java | 2 +- 11 files changed, 125 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
