details: /erp/devel/pi/rev/d7539eca3593
changeset: 10672:d7539eca3593
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Feb 15 19:32:46 2011 +0100
summary: Added filter for Production windows on Product Complete selector.
details: /erp/devel/pi/rev/7b2130ca71ad
changeset: 10673:7b2130ca71ad
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Feb 15 19:33:29 2011 +0100
summary: [OBUISEL] Fix issue with custom queries selectors and display field.
details: /erp/devel/pi/rev/5dbb31365d77
changeset: 10674:5dbb31365d77
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Feb 15 19:33:55 2011 +0100
summary: [OBUISEL] Fix issue adding default filter expression.
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
| 2 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 12 ++++++---
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
| 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diffs (48 lines):
diff -r f2202114031e -r 5dbb31365d77
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
Tue Feb 15 19:32:09 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
Tue Feb 15 19:33:55 2011 +0100
@@ -311,7 +311,7 @@
try {
Object result = engine.eval(sel.getFilterExpression());
if (result != null && !result.toString().equals("")) {
- return NEW_FILTER_CLAUSE + result.toString();
+ return NEW_FILTER_CLAUSE + "(" + result.toString() + ")";
}
} catch (Exception e) {
log.error("Error evaluating filter expression: " + e.getMessage(), e);
diff -r f2202114031e -r 5dbb31365d77
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Tue Feb 15 19:32:09 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Tue Feb 15 19:33:55 2011 +0100
@@ -120,12 +120,16 @@
* @return the field in the popup to set.
*/
public String getDefaultPopupFilterField() {
- if (getSelector().getDisplayfield() != null &&
getSelector().getDisplayfield().isShowingrid()) {
- if (!getSelector().isCustomQuery() &&
getSelector().getDisplayfield().getProperty() != null) {
- return getSelector().getDisplayfield().getProperty();
- } else if (getSelector().isCustomQuery()
+ if (getSelector().isCustomQuery()) {
+ if (getSelector().getDisplayfield() != null
&& getSelector().getDisplayfield().getDisplayColumnAlias() != null) {
return getSelector().getDisplayfield().getDisplayColumnAlias();
+ }
+ return JsonConstants.IDENTIFIER;
+ }
+ if (getSelector().getDisplayfield() != null &&
getSelector().getDisplayfield().isShowingrid()) {
+ if (getSelector().getDisplayfield().getProperty() != null) {
+ return getSelector().getDisplayfield().getProperty();
} else {
return
getSelector().getDisplayfield().getObserdsDatasourceField().getName();
}
diff -r f2202114031e -r 5dbb31365d77
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Feb 15 19:32:09
2011 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Feb 15 19:33:55
2011 +0100
@@ -24,7 +24,7 @@
<!--4C8BC3E8E56441F4B8C98C684A0C9212--> <NAME><![CDATA[Product
Complete]]></NAME>
<!--4C8BC3E8E56441F4B8C98C684A0C9212-->
<AD_REFERENCE_ID><![CDATA[800011]]></AD_REFERENCE_ID>
<!--4C8BC3E8E56441F4B8C98C684A0C9212-->
<AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
-<!--4C8BC3E8E56441F4B8C98C684A0C9212--> <FILTER_EXPRESSION><![CDATA["(prodtrl
is null or prodtrllan.language =\'" +
OB.getContext().getLanguage().getLanguage() +"\') and (uomtrl is null or
uomtrllan.language = \'" + OB.getContext().getLanguage().getLanguage() +"\')
and (orderuomuomtrl is null or orderuomuomtrl.language = \'" +
OB.getContext().getLanguage().getLanguage() +"\')"]]></FILTER_EXPRESSION>
+<!--4C8BC3E8E56441F4B8C98C684A0C9212--> <FILTER_EXPRESSION><![CDATA["(prodtrl
is null or prodtrllan.language =\'" +
OB.getContext().getLanguage().getLanguage() +"\') and (uomtrl is null or
uomtrllan.language = \'" + OB.getContext().getLanguage().getLanguage() +"\')
and (orderuomuomtrl is null or orderuomuomtrl.language = \'" +
OB.getContext().getLanguage().getLanguage() +"\')" + " and (
(\'"+OB.getWindowId()+"\' in (\'800051\', \'800052\') and prod.production =
true) or \'"+OB.getWindowId()+"\' not in (\'800051\',
\'800052\'))"]]></FILTER_EXPRESSION>
<!--4C8BC3E8E56441F4B8C98C684A0C9212-->
<OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
<!--4C8BC3E8E56441F4B8C98C684A0C9212--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4C8BC3E8E56441F4B8C98C684A0C9212-->
<VALUEFIELD_ID><![CDATA[D5CD42F686A14DFA949052B99900D679]]></VALUEFIELD_ID>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
