------------------------------------------------------------
revno: 17295
committer: Halvdan Hoem Grelland <halvda...@gmail.com>
branch nick: dhis2
timestamp: Mon 2014-10-27 16:13:17 +0100
message:
Fix bug #1384277
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.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/webapi/controller/MessageConversationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-10-14 03:55:34 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-10-27 15:13:17 +0000
@@ -138,7 +138,7 @@
}
else if ( options.hasPaging() )
{
- int count = manager.getCount( getEntityClass() );
+ int count = messageService.getMessageConversationCount();
Pager pager = new Pager( options.getPage(), count, options.getPageSize() );
metaData.setPager( pager );
@@ -371,7 +371,6 @@
return responseNode;
}
-
//--------------------------------------------------------------------------
// Delete a MessageConversation (requires override auth)
//--------------------------------------------------------------------------
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
