midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3302 Enable user preferences as context logic

This commit is contained in:
Carlos Ruiz 2017-02-21 08:50:03 +01:00
parent 64371d758d
commit b56a83ff55
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/util/Env.java
View File

@ -549,7 +549,7 @@ public final class Env
if (s == null) if (s == null)
{ {
// Explicit Base Values // Explicit Base Values
if (context.startsWith("#") || context.startsWith("$")) if (context.startsWith("#") || context.startsWith("$") || context.startsWith("P|"))
return getContext(ctx, context); return getContext(ctx, context);
if (onlyWindow) // no Default values if (onlyWindow) // no Default values
return ""; return "";

4
org.adempiere.base/src/org/compiere/util/Evaluator.java
View File

@ -98,7 +98,7 @@ public class Evaluator
} }
String exprStrand = st.nextToken().trim(); String exprStrand = st.nextToken().trim();
if (exprStrand.matches("^@\\d+$")) if (exprStrand.matches("^@\\d+$") || "@P".equals(exprStrand))
{ {
exprStrand = exprStrand.concat(st.nextToken()); exprStrand = exprStrand.concat(st.nextToken());
exprStrand = exprStrand.concat(st.nextToken()); exprStrand = exprStrand.concat(st.nextToken());
@ -112,7 +112,7 @@ public class Evaluator
//boolean temp = evaluateLogicTuple(source, st.nextToken()); //boolean temp = evaluateLogicTuple(source, st.nextToken());
exprStrand = st.nextToken().trim(); exprStrand = st.nextToken().trim();
if (exprStrand.matches("^@\\d+$")) if (exprStrand.matches("^@\\d+$") || "@P".equals(exprStrand))
{ {
exprStrand = exprStrand.concat(st.nextToken()); exprStrand = exprStrand.concat(st.nextToken());
exprStrand = exprStrand.concat(st.nextToken()); exprStrand = exprStrand.concat(st.nextToken());