[incubator-dlab] branch develop updated: [DLAB-1959] Fixed issue with pagination on Audit page

[ofuks]

This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 282641f  [DLAB-1959] Fixed issue with pagination on Audit page
282641f is described below

commit 282641f9ff30c4611a2c92165c3b1765c6c89957
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Wed Jul 22 12:01:25 2020 +0300

    [DLAB-1959] Fixed issue with pagination on Audit page
---
 .../src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
index 1106fdb..fefa1a4 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
@@ -86,8 +86,8 @@ public class AuditDAOImpl extends BaseDAO implements AuditDAO 
{
             countPipeline.add(match);
         }
         countPipeline.add(count());
-        valuesPipeline.addAll(Arrays.asList(skip(pageSize * (pageNumber - 1)), 
limit(pageSize)));
         valuesPipeline.add(sortCriteria());
+        valuesPipeline.addAll(Arrays.asList(skip(pageSize * (pageNumber - 1)), 
limit(pageSize)));
 
         List<Bson> userFilter = 
Collections.singletonList(group(getGroupingFields(USER)));
         List<Bson> projectFilter = 
Collections.singletonList(group(getGroupingFields(PROJECT)));


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org