fix: Smart Browser omit isInfoOnly fields from query criteria. (#519)

solop-develop · Sep 25, 2023 · f23d847 · f23d847
1 parent acd8043
commit f23d847
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/org/spin/base/db/WhereClauseUtil.java b/src/main/java/org/spin/base/db/WhereClauseUtil.java
@@ -803,7 +803,7 @@ public static String getBrowserWhereClauseFromCriteria(MBrowse browser, Criteria
 					String rangeColumnName = columnName.substring(0, columnName.length() - "_To".length());
 					browseField = browseFields.get(rangeColumnName);
 				}
-				if (browseField == null) {
+				if (browseField == null || browseField.isInfoOnly()) {
 					return;
 				}
 				MViewColumn viewColumn = browseField.getAD_View_Column();
@@ -829,9 +829,9 @@ public static String getBrowserWhereClauseFromCriteria(MBrowse browser, Criteria
 							.orElse(Condition.newBuilder().build())
 						;
 						valueTo = conditionEnd.getValue();
-						operatorValue = conditionEnd.getOperatorValue();
+						operatorTo = conditionEnd.getOperatorValue();
 						if (conditionStart.getOperatorValue() > 0 && operatorValue == Operator.VOID_VALUE) {
-							operatorValue = conditionStart.getOperatorValue();
+							operatorTo = conditionStart.getOperatorValue();
 						}
 					}
 

diff --git a/src/main/java/org/spin/grpc/service/UserInterfaceServiceImplementation.java b/src/main/java/org/spin/grpc/service/UserInterfaceServiceImplementation.java
@@ -2928,8 +2928,10 @@ private ListBrowserItemsResponse.Builder listBrowserItems(ListBrowserItemsReques
 				throw new AdempiereException("@AD_Browse_ID@ @WhereClause@ @Unparseable@");
 			}
 			whereClause
-				.append(" AND ")
-				.append(parsedWhereClause);
+				.append(" AND (")
+				.append(parsedWhereClause)
+				.append(")")
+			;
 		}
 
 		//	For dynamic condition