From 32f4bc1d300412d76a029fd1ccbe969f6aa919b0 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Mon, 7 Jan 2013 15:02:06 +0000 Subject: [PATCH] fix sql issue with checker inbox.2 --- .../service/PortfolioCommandsReadPlatformServiceImpl.java | 2 +- .../monetary/service/ConfigurationDomainServiceJpa.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java index 82eec36af..f828e29b8 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java @@ -54,7 +54,7 @@ public class PortfolioCommandsReadPlatformServiceImpl implements PortfolioComman final CommandSourceMapper rm = new CommandSourceMapper(); final String sql = "select " + rm.schema() - + " where mc.checker_id is null and mc.processing_result_enum = 2 order by mc.made_on_date DESC, mc.api_resource ASC, mc.action_name ASC"; + + " where mc.checker_id is null and mc.processing_result_enum = 2 order by mc.made_on_date DESC, mc.entity_name ASC, mc.action_name ASC"; return this.jdbcTemplate.query(sql, rm, new Object[] {}); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/ConfigurationDomainServiceJpa.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/ConfigurationDomainServiceJpa.java index f6643d831..cb5ccfe81 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/ConfigurationDomainServiceJpa.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/ConfigurationDomainServiceJpa.java @@ -15,7 +15,7 @@ public class ConfigurationDomainServiceJpa implements ConfigurationDomainService /* * hard code to false to disable maker checker across the board. */ - private final boolean makerCheckerGloablConfigurationEnabled = false; + private final boolean makerCheckerGloablConfigurationEnabled = true; @Autowired public ConfigurationDomainServiceJpa(final PermissionRepository permissionRepository) {