dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25510
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12680: adjust viewClass on /api/me
------------------------------------------------------------
revno: 12680
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 15:18:44 +0200
message:
adjust viewClass on /api/me
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2013-09-18 20:47:45 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2013-10-15 13:18:44 +0000
@@ -42,6 +42,7 @@
import org.hisp.dhis.api.webdomain.user.Inbox;
import org.hisp.dhis.api.webdomain.user.Recipients;
import org.hisp.dhis.api.webdomain.user.UserAccount;
+import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.dxf2.utils.JacksonUtils;
@@ -129,7 +130,7 @@
throw new NotAuthenticatedException();
}
- JacksonUtils.toJson( response.getOutputStream(), currentUser );
+ JacksonUtils.toJsonWithView( response.getOutputStream(), currentUser, DetailedView.class );
}
@RequestMapping(value = "/inbox", produces = { "application/json", "text/*" })