#6548 Skip filtering by active records if luookupInfo is showing inac…

…tive records #6548 Lookup Process parameters shall allow inactive records
metasfresh · Apr 29, 2020 · 8aac0f5 · 8aac0f5
1 parent 4d6b176
commit 8aac0f5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...sh-webui-api/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java b/...sh-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();
 		}