dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17361
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-11-06 00:28:41 +0100
message:
  Fixed bug where using a query filter would allow fetching of any and all MessageConversations for any user.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java
  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-api/src/main/java/org/hisp/dhis/message/MessageService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageService.java	2014-08-20 14:37:14 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageService.java	2014-11-05 23:28:41 +0000
@@ -90,6 +90,12 @@
 
     long getUnreadMessageConversationCount( User user );
 
+    /**
+     * Get all MessageConversations for the current user.
+     * @return a list of all message conversations for the current user.
+     */
+    List<MessageConversation> getMessageConversations();
+
     List<MessageConversation> getMessageConversations( int first, int max );
 
     List<MessageConversation> getMessageConversations( boolean followUpOnly, boolean unreadOnly, int first, int max );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2014-11-05 23:28:41 +0000
@@ -272,6 +272,12 @@
     }
 
     @Override
+    public List<MessageConversation> getMessageConversations()
+    {
+        return messageConversationStore.getMessageConversations( currentUserService.getCurrentUser(), false, false, null, null );
+    }
+
+    @Override
     public List<MessageConversation> getMessageConversations( int first, int max )
     {
         return messageConversationStore.getMessageConversations( currentUserService.getCurrentUser(), false, false,

=== 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-27 15:13:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java	2014-11-05 23:28:41 +0000
@@ -147,7 +147,7 @@
         }
         else
         {
-            entityList = new ArrayList<>( manager.getAll( getEntityClass() ) );
+            entityList = new ArrayList<>( messageService.getMessageConversations() );
         }
 
         return entityList;