edit

oneteme · Aug 27, 2024 · 8199e14 · 8199e14
1 parent 0156a27
commit 8199e14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/org/usf/jquery/web/ArgumentParsers.java b/src/main/java/org/usf/jquery/web/ArgumentParsers.java
@@ -102,7 +102,7 @@ public static JDBCArgumentParser jdbcArgParser(@NonNull JDBCType type) {
 	public static JavaArgumentParser jqueryArgParser(@NonNull JQueryType type) {
 		switch (type) {
 		case QUERY_COLUMN:	return RequestEntryChain::evalQueryColumn;
-		case NAMED_COLUMN:	return (e,v)-> e.evalColumn(v, true, false);
+		case NAMED_COLUMN:	return (e,v)-> e.evalColumn(v, true, true); //separate query context 
 		case COLUMN:		return (e,v)-> e.evalColumn(v, false, false);
 		case FILTER: 		return RequestEntryChain::evalFilter;
 		case ORDER: 		return RequestEntryChain::evalOrder;

diff --git a/src/main/java/org/usf/jquery/web/RequestEntryChain.java b/src/main/java/org/usf/jquery/web/RequestEntryChain.java
@@ -371,13 +371,12 @@ private Optional<ViewResource> lookupResource(ViewDecorator td) { //do not chang
 	}
 
 	private Optional<ViewResource> lookupViewResource(ViewDecorator td, Predicate<TypedOperator> pre) {
-		if(td instanceof QueryDecorator qd) { //query column
-			return ofNullable(qd.column(value))
-					.map(c-> new ViewResource(td, null, requireNoArgs(), c)); //no column decorator
-		}
-		return currentContext().lookupRegisteredColumn(value)
-				.map(cd-> new ViewResource(td, cd, requireNoArgs(), td.column(cd)))
-				.or(()-> lookupOperation(td, null, pre).map(col-> new ViewResource(td, null, this, col)));  //no column decorator
+		var res = td instanceof QueryDecorator qd 
+				? ofNullable(qd.column(value))
+					.map(c-> new ViewResource(td, null, requireNoArgs(), c))
+				: currentContext().lookupRegisteredColumn(value)
+					.map(cd-> new ViewResource(td, cd, requireNoArgs(), td.column(cd)));
+		return res.or(()-> lookupOperation(td, null, pre).map(col-> new ViewResource(td, null, this, col)));
 	}
 
 	private Optional<OperationColumn> lookupOperation(ViewDecorator vd, DBColumn col, Predicate<TypedOperator> opr) {