Merge remote-tracking branch 'soc_anuruddha/mifosx-339' into mifosplatform-1.1.0

mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java

@@ -169,11 +169,13 @@ public class JournalEntryReadPlatformServiceImpl implements JournalEntryReadPlat
                 maxLimitAllowed = limit;
             }
             sqlBuilder.append(" limit ").append(maxLimitAllowed);
-        }
-
-        if (offset != null) {
-            sqlBuilder.append(" offset ").append(offset);
-        }
+            if (offset != null) {
+                sqlBuilder.append(" offset ").append(offset);
+            }
+        } else if (limit != null && limit == -1) {
+            ;
+        } else
+            sqlBuilder.append(" limit ").append(200);
 
         final Object[] finalObjectArray = Arrays.copyOf(objectArray, arrayPos);
         final String sqlCountRows = "SELECT FOUND_ROWS()";

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java

@@ -103,10 +103,9 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
 
         if (searchParameters.isLimited()) {
             sqlBuilder.append(" limit ").append(searchParameters.getLimit());
-        }
-
-        if (searchParameters.isOffset()) {
-            sqlBuilder.append(" offset ").append(searchParameters.getOffset());
+            if (searchParameters.isOffset()) {
+                sqlBuilder.append(" offset ").append(searchParameters.getOffset());
+            }
         }
 
         final String sqlCountRows = "SELECT FOUND_ROWS()";

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java

@@ -208,11 +208,10 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
 
         if (searchParameters.isLimited()) {
             sqlBuilder.append(" limit ").append(searchParameters.getLimit());
-        }
-
-        if (searchParameters.isOffset()) {
-            sqlBuilder.append(" offset ").append(searchParameters.getOffset());
-        }
+            if (searchParameters.isOffset()) {
+                sqlBuilder.append(" offset ").append(searchParameters.getOffset());
+            }
+        } 
 
         final String sqlCountRows = "SELECT FOUND_ROWS()";
         return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlCountRows, sqlBuilder.toString(),

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java

@@ -126,10 +126,9 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
 
         if (searchParameters.isLimited()) {
             sqlBuilder.append(" limit ").append(searchParameters.getLimit());
-        }
-
-        if (searchParameters.isOffset()) {
-            sqlBuilder.append(" offset ").append(searchParameters.getOffset());
+            if (searchParameters.isOffset()) {
+                sqlBuilder.append(" offset ").append(searchParameters.getOffset());
+            }
         }
 
         final String sqlCountRows = "SELECT FOUND_ROWS()";

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java

@@ -70,12 +70,13 @@ public final class SearchParameters {
         return StringUtils.isNotBlank(this.sortOrder);
     }
     
-    public static Integer getCheckedLimit(Integer maxLimitAllowed, Integer limit)
-    {
+    public static Integer getCheckedLimit(Integer maxLimitAllowed, Integer limit) {
         if (limit != null && limit < maxLimitAllowed && limit > 0) {
-            maxLimitAllowed = limit;
-        }
-        return maxLimitAllowed;        
+            return limit;
+        } else if (limit != null && limit == -1) {
+            return null;
+        } else
+            return maxLimitAllowed;
     }
 
     public String getSqlSearch() {