merging 9985 to the trunk

This commit is contained in:
tworrall 2012-08-02 16:01:23 +00:00
parent 8664bd25b4
commit 083678f5b2

View file

@ -87,13 +87,9 @@ class IndividualResponseBuilder {
* into the data model: no real data can be modified.
*/
// body.put("individual", wrap(itm, BeansWrapper.EXPOSE_SAFE));
if ( itm.person() ) {
body.put("publicationCount", getPublicationCount(itm.getUri(), vreq));
body.put("grantCount", getGrantCount(itm.getUri(), vreq));
}
if ( itm.organization() ) {
body.put("peopleCount", getPeopleCount(itm.getUri(), vreq));
}
body.put("publicationCount", getPublicationCount(itm.getUri(), vreq));
body.put("grantCount", getGrantCount(itm.getUri(), vreq));
body.put("peopleCount", getPeopleCount(itm.getUri(), vreq));
body.put("labelCount", getLabelCount(itm.getUri(), vreq));
body.put("individual", wrap(itm, new ReadOnlyBeansWrapper()));