From 8aac0f55cdd5a8e3d3c10e3ae54c325ab47cd796 Mon Sep 17 00:00:00 2001 From: Cristina Date: Wed, 29 Apr 2020 19:09:40 +0300 Subject: [PATCH] #6548 Skip filtering by active records if luookupInfo is showing inactive records #6548 Lookup Process parameters shall allow inactive records --- .../ui/web/window/descriptor/sql/SqlLookupDescriptor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java b/backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java index 20f33daed27..ce53f014252 100644 --- a/backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java +++ b/backend/metasfresh-webui-api/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java @@ -576,8 +576,12 @@ private static IStringExpression buildSqlWhere(final MLookupInfo lookupInfo, fin .append(DBConstants.FUNCNAME_unaccent_string).append("(").append(LookupDataSourceContext.PARAM_FilterSql).append(", 1)"); // IsActive WHERE - sqlWhereFinal.appendIfNotEmpty("\n AND "); - sqlWhereFinal.append(" /* active */ ('").append(SqlForFetchingLookupById.SQL_PARAM_ShowInactive).append("'='Y' OR ").append(tableName).append(".IsActive='Y')"); + if (!lookupInfo.isShowInactiveValues()) + { + sqlWhereFinal.appendIfNotEmpty("\n AND "); + sqlWhereFinal.append(" /* active */ ('").append(SqlForFetchingLookupById.SQL_PARAM_ShowInactive) + .append("'='Y' OR ").append(tableName).append(".IsActive='Y')"); + } return sqlWhereFinal.build(); }