details: /erp/devel/pi/rev/f9a01e4e942e
changeset: 10877:f9a01e4e942e
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Feb 24 18:00:05 2011 +0100
summary: [OBUISEL] Added show in picklist column.
details: /erp/devel/pi/rev/347bda926bde
changeset: 10878:347bda926bde
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Feb 24 18:02:02 2011 +0100
summary: [OBUISEL] Implemented show in picklist option to add extra field to
the combobox.
details: /erp/devel/pi/rev/9add58c965b3
changeset: 10879:9add58c965b3
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Feb 24 18:02:48 2011 +0100
summary: [OBUISEL] Initialize showinpicklist column
details: /erp/devel/pi/rev/664d362dfa39
changeset: 10880:664d362dfa39
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Feb 24 18:03:25 2011 +0100
summary: [APRM] Initialize showinpicklist column.
details: /erp/devel/pi/rev/3ae48cadcc36
changeset: 10881:3ae48cadcc36
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Feb 24 18:03:46 2011 +0100
summary: Set showinpicklist column on BP, Product and Product Complete
selectors.
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 13 ++
modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
| 5 +
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml
| 35 +++++++-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
| 12 ++
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
| 25 +++++
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 1 +
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 21 ++-
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 47 ++++++++++
8 files changed, 150 insertions(+), 9 deletions(-)
diffs (truncated from 647 to 300 lines):
diff -r be81ceac4a34 -r 3ae48cadcc36
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 18:03:46 2011 +0100
@@ -19,6 +19,7 @@
<!--14ED4E3D75274AB3A59F3941D64027BE--> <SORTNO><![CDATA[2]]></SORTNO>
<!--14ED4E3D75274AB3A59F3941D64027BE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--14ED4E3D75274AB3A59F3941D64027BE--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--14ED4E3D75274AB3A59F3941D64027BE-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--14ED4E3D75274AB3A59F3941D64027BE--></OBUISEL_SELECTOR_FIELD>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--><OBUISEL_SELECTOR_FIELD>
@@ -42,6 +43,7 @@
<!--17843AC2A9E247E1A6DAD8041DFDB07A--> <SORTNO><![CDATA[2]]></SORTNO>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--17843AC2A9E247E1A6DAD8041DFDB07A-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--></OBUISEL_SELECTOR_FIELD>
<!--334D0D40EF224D5CA5B9AA56124FEE25--><OBUISEL_SELECTOR_FIELD>
@@ -63,6 +65,7 @@
<!--334D0D40EF224D5CA5B9AA56124FEE25--> <SORTNO><![CDATA[3]]></SORTNO>
<!--334D0D40EF224D5CA5B9AA56124FEE25--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--334D0D40EF224D5CA5B9AA56124FEE25--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--334D0D40EF224D5CA5B9AA56124FEE25-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--334D0D40EF224D5CA5B9AA56124FEE25--></OBUISEL_SELECTOR_FIELD>
<!--34940C0A024A4C438BF57B4A12E656E5--><OBUISEL_SELECTOR_FIELD>
@@ -84,6 +87,7 @@
<!--34940C0A024A4C438BF57B4A12E656E5--> <SORTNO><![CDATA[1]]></SORTNO>
<!--34940C0A024A4C438BF57B4A12E656E5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--34940C0A024A4C438BF57B4A12E656E5--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--34940C0A024A4C438BF57B4A12E656E5-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--34940C0A024A4C438BF57B4A12E656E5--></OBUISEL_SELECTOR_FIELD>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--><OBUISEL_SELECTOR_FIELD>
@@ -103,6 +107,7 @@
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--> <SORTNO><![CDATA[5]]></SORTNO>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--></OBUISEL_SELECTOR_FIELD>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--><OBUISEL_SELECTOR_FIELD>
@@ -124,6 +129,7 @@
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <SORTNO><![CDATA[5]]></SORTNO>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--583F20A11FD34C65BEC1F15D5DBF70BA-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--></OBUISEL_SELECTOR_FIELD>
<!--5C35042E8E9D426485AC3CE5C7200A7D--><OBUISEL_SELECTOR_FIELD>
@@ -143,6 +149,7 @@
<!--5C35042E8E9D426485AC3CE5C7200A7D--> <SORTNO><![CDATA[6]]></SORTNO>
<!--5C35042E8E9D426485AC3CE5C7200A7D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--5C35042E8E9D426485AC3CE5C7200A7D--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--5C35042E8E9D426485AC3CE5C7200A7D-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--5C35042E8E9D426485AC3CE5C7200A7D--></OBUISEL_SELECTOR_FIELD>
<!--616F97738AFD4595B74A6A60C8D4B5C4--><OBUISEL_SELECTOR_FIELD>
@@ -164,6 +171,7 @@
<!--616F97738AFD4595B74A6A60C8D4B5C4--> <SORTNO><![CDATA[1]]></SORTNO>
<!--616F97738AFD4595B74A6A60C8D4B5C4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--616F97738AFD4595B74A6A60C8D4B5C4--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--616F97738AFD4595B74A6A60C8D4B5C4-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--616F97738AFD4595B74A6A60C8D4B5C4--></OBUISEL_SELECTOR_FIELD>
<!--64F6733BE6654339AE67403E0925F525--><OBUISEL_SELECTOR_FIELD>
@@ -185,6 +193,7 @@
<!--64F6733BE6654339AE67403E0925F525--> <SORTNO><![CDATA[3]]></SORTNO>
<!--64F6733BE6654339AE67403E0925F525--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--64F6733BE6654339AE67403E0925F525--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--64F6733BE6654339AE67403E0925F525-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--64F6733BE6654339AE67403E0925F525--></OBUISEL_SELECTOR_FIELD>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--><OBUISEL_SELECTOR_FIELD>
@@ -206,6 +215,7 @@
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <SORTNO><![CDATA[4]]></SORTNO>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--8EE2C299C0D7421DBEFE0FEBC9DED657-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--></OBUISEL_SELECTOR_FIELD>
<!--B67B839A695A44499277CF0D09FAC54F--><OBUISEL_SELECTOR_FIELD>
@@ -227,6 +237,7 @@
<!--B67B839A695A44499277CF0D09FAC54F--> <SORTNO><![CDATA[4]]></SORTNO>
<!--B67B839A695A44499277CF0D09FAC54F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B67B839A695A44499277CF0D09FAC54F--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B67B839A695A44499277CF0D09FAC54F-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--B67B839A695A44499277CF0D09FAC54F--></OBUISEL_SELECTOR_FIELD>
<!--C55EADA2C49F47DF8423C6BB8B97342E--><OBUISEL_SELECTOR_FIELD>
@@ -248,6 +259,7 @@
<!--C55EADA2C49F47DF8423C6BB8B97342E--> <SORTNO><![CDATA[0]]></SORTNO>
<!--C55EADA2C49F47DF8423C6BB8B97342E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C55EADA2C49F47DF8423C6BB8B97342E--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--C55EADA2C49F47DF8423C6BB8B97342E-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--C55EADA2C49F47DF8423C6BB8B97342E--></OBUISEL_SELECTOR_FIELD>
<!--C5CFD3978631444EB97539BCEE3D5239--><OBUISEL_SELECTOR_FIELD>
@@ -269,6 +281,7 @@
<!--C5CFD3978631444EB97539BCEE3D5239--> <SORTNO><![CDATA[0]]></SORTNO>
<!--C5CFD3978631444EB97539BCEE3D5239--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C5CFD3978631444EB97539BCEE3D5239--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--C5CFD3978631444EB97539BCEE3D5239-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--C5CFD3978631444EB97539BCEE3D5239--></OBUISEL_SELECTOR_FIELD>
</data>
diff -r be81ceac4a34 -r 3ae48cadcc36
modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
---
a/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 18:03:46 2011 +0100
@@ -113,6 +113,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="SHOWINPICKLIST" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="OBSERDS_DATASOURCE_FIELD"
name="OBUISEL_S_OBSERDS_DSF">
<reference local="OBSERDS_DATASOURCE_FIELD_ID"
foreign="OBSERDS_DATASOURCE_FIELD_ID"/>
</foreign-key>
@@ -139,6 +143,7 @@
<check name="OBUISEL_SF_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<check name="OBUISEL_SF_SBOX_CHECK"><![CDATA[SEARCHINSUGGESTIONBOX IN
('Y', 'N')]]></check>
<check name="OBUISEL_SF_SHOWINGRID_CHECK"><![CDATA[SHOWINGRID IN ('Y',
'N')]]></check>
+ <check name="OBUISEL_SF_SHOWINPICKLIST_CHK"><![CDATA[SHOWINPICKLIST IN
('Y', 'N')]]></check>
<check name="OBUISEL_SF_SORT_CHECK"><![CDATA[SORT IN ('Y',
'N')]]></check>
</table>
</database>
diff -r be81ceac4a34 -r 3ae48cadcc36
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml
Thu Feb 24 18:03:46 2011 +0100
@@ -1807,7 +1807,7 @@
<!--9AAE820D05DEA0DEE040007F01001245-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--9AAE820D05DEA0DEE040007F01001245-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--9AAE820D05DEA0DEE040007F01001245-->
<AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
-<!--9AAE820D05DEA0DEE040007F01001245--> <POSITION><![CDATA[27]]></POSITION>
+<!--9AAE820D05DEA0DEE040007F01001245--> <POSITION><![CDATA[28]]></POSITION>
<!--9AAE820D05DEA0DEE040007F01001245-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--9AAE820D05DEA0DEE040007F01001245--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--9AAE820D05DEA0DEE040007F01001245-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1847,6 +1847,39 @@
<!--9CFAD359FF0D433894E34EA05F6207FE-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--9CFAD359FF0D433894E34EA05F6207FE--></AD_COLUMN>
+<!--9D05F0BD3CA5AAECE040007F0100087A--><AD_COLUMN>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<AD_COLUMN_ID><![CDATA[9D05F0BD3CA5AAECE040007F0100087A]]></AD_COLUMN_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <NAME><![CDATA[Show In
Picklist]]></NAME>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <HELP><![CDATA[Sets additional fields
to appear on the selectors pick list.]]></HELP>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<COLUMNNAME><![CDATA[Showinpicklist]]></COLUMNNAME>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<AD_TABLE_ID><![CDATA[A2F880F9981349E2A6A57BD58267EBCE]]></AD_TABLE_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <SEQNO><![CDATA[290]]></SEQNO>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<AD_ELEMENT_ID><![CDATA[9D05F0BD3CA6AAECE040007F0100087A]]></AD_ELEMENT_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <POSITION><![CDATA[29]]></POSITION>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9D05F0BD3CA5AAECE040007F0100087A--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9D05F0BD3CA5AAECE040007F0100087A-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9D05F0BD3CA5AAECE040007F0100087A--></AD_COLUMN>
+
<!--A03032C18765408EB1F0EF608CDF37D0--><AD_COLUMN>
<!--A03032C18765408EB1F0EF608CDF37D0-->
<AD_COLUMN_ID><![CDATA[A03032C18765408EB1F0EF608CDF37D0]]></AD_COLUMN_ID>
<!--A03032C18765408EB1F0EF608CDF37D0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r be81ceac4a34 -r 3ae48cadcc36
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
---
a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
Thu Feb 24 18:03:46 2011 +0100
@@ -186,6 +186,18 @@
<!--9A5A29111529107DE040007F01002F6B-->
<AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
<!--9A5A29111529107DE040007F01002F6B--></AD_ELEMENT>
+<!--9D05F0BD3CA6AAECE040007F0100087A--><AD_ELEMENT>
+<!--9D05F0BD3CA6AAECE040007F0100087A-->
<AD_ELEMENT_ID><![CDATA[9D05F0BD3CA6AAECE040007F0100087A]]></AD_ELEMENT_ID>
+<!--9D05F0BD3CA6AAECE040007F0100087A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D05F0BD3CA6AAECE040007F0100087A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D05F0BD3CA6AAECE040007F0100087A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D05F0BD3CA6AAECE040007F0100087A-->
<COLUMNNAME><![CDATA[Showinpicklist]]></COLUMNNAME>
+<!--9D05F0BD3CA6AAECE040007F0100087A--> <NAME><![CDATA[Show In
Picklist]]></NAME>
+<!--9D05F0BD3CA6AAECE040007F0100087A--> <PRINTNAME><![CDATA[Show In
Picklist]]></PRINTNAME>
+<!--9D05F0BD3CA6AAECE040007F0100087A--> <HELP><![CDATA[Sets additional fields
to appear on the selectors pick list.]]></HELP>
+<!--9D05F0BD3CA6AAECE040007F0100087A-->
<AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9D05F0BD3CA6AAECE040007F0100087A--></AD_ELEMENT>
+
<!--B843BE7E4A984128AA589685C313E709--><AD_ELEMENT>
<!--B843BE7E4A984128AA589685C313E709-->
<AD_ELEMENT_ID><![CDATA[B843BE7E4A984128AA589685C313E709]]></AD_ELEMENT_ID>
<!--B843BE7E4A984128AA589685C313E709-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r be81ceac4a34 -r 3ae48cadcc36
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
Thu Feb 24 18:03:46 2011 +0100
@@ -1139,6 +1139,31 @@
<!--9AAE820D05DFA0DEE040007F01001245-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--9AAE820D05DFA0DEE040007F01001245--></AD_FIELD>
+<!--9D05F0BD3CADAAECE040007F0100087A--><AD_FIELD>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<AD_FIELD_ID><![CDATA[9D05F0BD3CADAAECE040007F0100087A]]></AD_FIELD_ID>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <NAME><![CDATA[Show In
Picklist]]></NAME>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <DESCRIPTION><![CDATA[Selector
Field]]></DESCRIPTION>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <HELP><![CDATA[The selector field
defines a column/property which is shown in the suggestion box or popup
window.]]></HELP>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<AD_TAB_ID><![CDATA[75FEAE3FF26F49E394BDF833B1B97647]]></AD_TAB_ID>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<AD_COLUMN_ID><![CDATA[9D05F0BD3CA5AAECE040007F0100087A]]></AD_COLUMN_ID>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <SEQNO><![CDATA[115]]></SEQNO>
+<!--9D05F0BD3CADAAECE040007F0100087A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9D05F0BD3CADAAECE040007F0100087A-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9D05F0BD3CADAAECE040007F0100087A--></AD_FIELD>
+
<!--9FE662DDA6514019926F06FA6363D17E--><AD_FIELD>
<!--9FE662DDA6514019926F06FA6363D17E-->
<AD_FIELD_ID><![CDATA[9FE662DDA6514019926F06FA6363D17E]]></AD_FIELD_ID>
<!--9FE662DDA6514019926F06FA6363D17E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r be81ceac4a34 -r 3ae48cadcc36
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
---
a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 18:03:46 2011 +0100
@@ -17,6 +17,7 @@
<!--DD28F69792084E7F8EBBF2FA94F52A5F--> <SORTNO><![CDATA[0]]></SORTNO>
<!--DD28F69792084E7F8EBBF2FA94F52A5F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--DD28F69792084E7F8EBBF2FA94F52A5F--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--DD28F69792084E7F8EBBF2FA94F52A5F-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--DD28F69792084E7F8EBBF2FA94F52A5F--></OBUISEL_SELECTOR_FIELD>
</data>
diff -r be81ceac4a34 -r 3ae48cadcc36
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
Thu Feb 24 17:58:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Thu Feb 24 18:03:46 2011 +0100
@@ -519,14 +519,18 @@
}
public List<LocalSelectorField> getPickListFields() {
- // return the displayfield as the picklist
+ // return the displayfield as the first column of the picklist and add all
the extra fields with
+ // the showInPicklist flag.
+ List<LocalSelectorField> pickListFields = new
ArrayList<LocalSelectorField>();
final String displayField = getDisplayField();
final LocalSelectorField localSelectorField = new LocalSelectorField();
localSelectorField.setName(displayField);
- localSelectorField.setTitle(displayField);
+ localSelectorField.setTitle(" ");
localSelectorField.setSort(false);
localSelectorField.setFilter(false);
- return Collections.singletonList(localSelectorField);
+ pickListFields.add(localSelectorField);
+ pickListFields.addAll(getSelectorFields(true, false));
+ return pickListFields;
}
public List<LocalSelectorField> getSelectorGridFields() {
@@ -544,12 +548,13 @@
if (!selectorField.isActive()) {
continue;
}
- // if (pickList && !selectorField.isShowinsuggestionbox()) {
- // continue;
- // }
if (popupGrid && !selectorField.isShowingrid()) {
continue;
}
+ if (pickList && (!selectorField.isShowInPicklist())
+ || selectorField.equals(getSelector().getDisplayfield())) {
+ continue;
+ }
final LocalSelectorField localSelectorField = new LocalSelectorField();
String fieldName = getPropertyOrDataSourceField(selectorField);
@@ -563,9 +568,9 @@
localSelectorField.setName(fieldName);
localSelectorField.setTitle(getTranslatedName(selectorField));
- localSelectorField.setSort(selectorField.isSortable());
+ localSelectorField.setSort(!pickList && selectorField.isSortable());
- localSelectorField.setFilter(selectorField.isFilterable());
+ localSelectorField.setFilter(!pickList && selectorField.isFilterable());
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
