CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

MIFOSX-750: earlier fix was incorrect and messed up paging results.

Browse Source
This commit is contained in:
Keith Woodlock
2013-10-25 11:29:53 +01:00
parent 5d8738c715
commit 1d61eef369
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformSecurityContext.java
+1 -1
View File
@@ -13,5 +13,5 @@ public interface PlatformSecurityContext {
void validateAccessRights(String resourceOfficeHierarchy); void validateAccessRights(String resourceOfficeHierarchy);
String officeHierarcy(); String OfficeHierarchy();
} }
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class SpringSecurityPlatformSecurityContext implements PlatformSecurityCo
} }
@Override @Override
public String officeHierarcy() { public String OfficeHierarchy() {
return authenticatedUser().getOffice().getHierarchy(); return authenticatedUser().getOffice().getHierarchy();
} }
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
+7 -7
View File
@@ -93,13 +93,13 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
@Override @Override
public Page<ClientData> retrieveAll(final SearchParameters searchParameters) { public Page<ClientData> retrieveAll(final SearchParameters searchParameters) {
final String hierarchy = this.context.officeHierarcy(); final String userOfficeHierarchy = this.context.OfficeHierarchy();
String hierarchySearchString = hierarchy + "%"; final String underHierarchySearchString = userOfficeHierarchy + "%";
if (searchParameters.isScopedByOfficeHierarchy()) { // if (searchParameters.isScopedByOfficeHierarchy()) {
this.context.validateAccessRights(searchParameters.getHierarchy()); // this.context.validateAccessRights(searchParameters.getHierarchy());
hierarchySearchString = searchParameters.getHierarchy(); // underHierarchySearchString = searchParameters.getHierarchy() + "%";
} // }
final StringBuilder sqlBuilder = new StringBuilder(200); final StringBuilder sqlBuilder = new StringBuilder(200);
sqlBuilder.append("select SQL_CALC_FOUND_ROWS "); sqlBuilder.append("select SQL_CALC_FOUND_ROWS ");
@@ -129,7 +129,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
final String sqlCountRows = "SELECT FOUND_ROWS()"; final String sqlCountRows = "SELECT FOUND_ROWS()";
return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlCountRows, sqlBuilder.toString(), new Object[] { return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlCountRows, sqlBuilder.toString(), new Object[] {
hierarchySearchString, hierarchySearchString }, this.clientMapper); underHierarchySearchString, underHierarchySearchString }, this.clientMapper);
} }
private String buildSqlStringFromClientCriteria(final SearchParameters searchParameters) { private String buildSqlStringFromClientCriteria(final SearchParameters searchParameters) {