DHIS2

=== 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 2012-10-22 10:53:03 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2012-10-23 12:20:27 +0000 @@ -122,8 +122,8 @@ } Inbox inbox = new Inbox(); - inbox.setMessageConversations( new ArrayList( messageService.getMessageConversations( 0, Integer.MAX_VALUE ) ) ); - inbox.setInterpretations( new ArrayList( interpretationService.getInterpretations( 0, Integer.MAX_VALUE ) ) ); + inbox.setMessageConversations( new ArrayList( messageService.getMessageConversations( 0, MAX_OBJECTS ) ) ); + inbox.setInterpretations( new ArrayList( interpretationService.getInterpretations( 0, MAX_OBJECTS ) ) ); JacksonUtils.toJson( response.getOutputStream(), inbox ); } === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm 2012-10-22 09:18:33 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm 2012-10-23 12:20:27 +0000 @@ -1,11 +1,14 @@ - - + + DHIS2 + + + === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm 2012-10-21 15:30:15 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm 2012-10-23 12:20:27 +0000 @@ -30,7 +30,7 @@ $(document).bind('pageinit', function() { $.ajax({ - url : '$baseUrl/../api/messageConversations/${messageId}.json', + url : '$baseUrl/../api/messageConversations/${messageId}?markRead=true', dataType: 'json' }).success(function ( data ) { var tmpl = jQuery('#message-template').html(); === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm 2012-10-10 17:14:33 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm 2012-10-23 12:20:27 +0000 @@ -1,16 +1,25 @@ @@ -24,7 +33,7 @@

Messages