Fixes displaylogic expressions using ad_reference_id as a number
authorIván Perdomo <ivan.perdomo@openbravo.com>
Tue, 08 Feb 2011 19:22:27 +0100
changeset 10439 b3b8995c898a
parent 10438 f7b02138af86
child 10440 9b6d0c7a2fed
Fixes displaylogic expressions using ad_reference_id as a number
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl	Tue Feb 08 18:29:50 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl	Tue Feb 08 19:22:27 2011 +0100
@@ -43,7 +43,7 @@
     ],
     outFields : {
     <#list data.outFields as selectorOutField>
-    '${selectorOutField.outFieldName}':'${selectorOutField.tabFieldName}'<#if selectorOutField_has_next>,</#if>
+    '${selectorOutField.outFieldName}': {'fieldName':'${selectorOutField.tabFieldName}', 'suffix': '${selectorOutField.outSuffix}'}<#if selectorOutField_has_next>,</#if>
     </#list>
     },
     extraSearchFields: [${data.extraSearchFields}],
--- a/src-db/database/sourcedata/AD_FIELD.xml	Tue Feb 08 18:29:50 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Feb 08 19:22:27 2011 +0100
@@ -1140,7 +1140,7 @@
 <!--158-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--158-->  <AD_COLUMN_ID><![CDATA[118]]></AD_COLUMN_ID>
 <!--158-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--158-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@!13&@AD_Reference_ID@!18&@AD_Reference_ID@!19&@AD_Reference_ID@!30&@AD_Reference_ID@!35]]></DISPLAYLOGIC>
+<!--158-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@!'13'&@AD_Reference_ID@!'18'&@AD_Reference_ID@!'19'&@AD_Reference_ID@!'30'&@AD_Reference_ID@!'35']]></DISPLAYLOGIC>
 <!--158-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--158-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--158-->  <SEQNO><![CDATA[110]]></SEQNO>
@@ -1417,7 +1417,7 @@
 <!--172-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--172-->  <AD_COLUMN_ID><![CDATA[115]]></AD_COLUMN_ID>
 <!--172-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--172-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@=17 | @AD_Reference_ID@=18 | @AD_Reference_ID@=19 | @AD_Reference_ID@=28]]></DISPLAYLOGIC>
+<!--172-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@='17' | @AD_Reference_ID@='18' | @AD_Reference_ID@='19' | @AD_Reference_ID@='28']]></DISPLAYLOGIC>
 <!--172-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--172-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--172-->  <SEQNO><![CDATA[130]]></SEQNO>
@@ -29884,7 +29884,7 @@
 <!--2526-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--2526-->  <AD_COLUMN_ID><![CDATA[3369]]></AD_COLUMN_ID>
 <!--2526-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2526-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@=28]]></DISPLAYLOGIC>
+<!--2526-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@='28']]></DISPLAYLOGIC>
 <!--2526-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--2526-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2526-->  <SEQNO><![CDATA[150]]></SEQNO>
@@ -30945,7 +30945,7 @@
 <!--2573-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--2573-->  <AD_COLUMN_ID><![CDATA[3389]]></AD_COLUMN_ID>
 <!--2573-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2573-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@=11 | @AD_Reference_ID@=12 | @AD_Reference_ID@=15 | @AD_Reference_ID@=22 | @AD_Reference_ID@=29 | @AD_Reference_ID@=800019]]></DISPLAYLOGIC>
+<!--2573-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@='11' | @AD_Reference_ID@='12' | @AD_Reference_ID@='15' | @AD_Reference_ID@='22' | @AD_Reference_ID@='29' | @AD_Reference_ID@='800019']]></DISPLAYLOGIC>
 <!--2573-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--2573-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2573-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -30971,7 +30971,7 @@
 <!--2574-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--2574-->  <AD_COLUMN_ID><![CDATA[3388]]></AD_COLUMN_ID>
 <!--2574-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2574-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@=11 | @AD_Reference_ID@=12 | @AD_Reference_ID@=15 | @AD_Reference_ID@=22 | @AD_Reference_ID@=29 | @AD_Reference_ID@=800019]]></DISPLAYLOGIC>
+<!--2574-->  <DISPLAYLOGIC><![CDATA[@AD_Reference_ID@='11' | @AD_Reference_ID@='12' | @AD_Reference_ID@='15' | @AD_Reference_ID@='22' | @AD_Reference_ID@='29' | @AD_Reference_ID@='800019']]></DISPLAYLOGIC>
 <!--2574-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--2574-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2574-->  <SEQNO><![CDATA[170]]></SEQNO>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Feb 08 18:29:50 2011 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Feb 08 19:22:27 2011 +0100
@@ -3540,6 +3540,7 @@
 <!--800057-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800057-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
 <!--800057-->  <PARENTREFERENCE_ID><![CDATA[30]]></PARENTREFERENCE_ID>
+<!--800057-->  <UI_IMPL><![CDATA[org.openbravo.userinterface.selector.reference.SelectorUIReference]]></UI_IMPL>
 <!--800057-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--800057--></AD_REFERENCE>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Tue Feb 08 19:22:27 2011 +0100
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--FF8080812E04B22A012E04B79C20001B--><OBCLKER_UIDEFINITION>
+<!--FF8080812E04B22A012E04B79C20001B-->  <OBCLKER_UIDEFINITION_ID><![CDATA[FF8080812E04B22A012E04B79C20001B]]></OBCLKER_UIDEFINITION_ID>
+<!--FF8080812E04B22A012E04B79C20001B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812E04B22A012E04B79C20001B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812E04B22A012E04B79C20001B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FF8080812E04B22A012E04B79C20001B-->  <AD_REFERENCE_ID><![CDATA[800057]]></AD_REFERENCE_ID>
+<!--FF8080812E04B22A012E04B79C20001B-->  <CLASSNAME><![CDATA[org.openbravo.userinterface.selector.reference.FKSelectorUIDefinition]]></CLASSNAME>
+<!--FF8080812E04B22A012E04B79C20001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812E04B22A012E04B79C20001B--></OBCLKER_UIDEFINITION>
+
+</data>