details: https://code.openbravo.com/erp/devel/pi/rev/4c3b627a612c changeset: 29573:4c3b627a612c user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Thu Jun 02 17:11:55 2016 +0200 summary: Related with issue 33064: form widgets cant be added to workspace
It has implemented a new flag (Available_in_workspace) in the widget definition that determines when a widget is available to be shown in the workspace. We have also added the default values to the widgets that already exist. By default yes. details: https://code.openbravo.com/erp/devel/pi/rev/3ea47b48a028 changeset: 29574:3ea47b48a028 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Thu Jun 02 17:14:50 2016 +0200 summary: Fixed issue 33064: form widgets cant be added to workspace The problem was related with widgets that can be embedded into a form. In some cases, these widgets should not be placed into the workspace. To resolve this problem in a generic way, it has been implemented a flag (Available_in_workspace) in the widget definition that determines when a widget is available to be shown in the workspace. Now, any widget that does not have selected the new flag, will not appear in the list of widgets to place into the workspace. details: https://code.openbravo.com/erp/devel/pi/rev/4cb4e1989316 changeset: 29575:4cb4e1989316 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Thu Jun 02 19:27:18 2016 +0200 summary: Related with issue 33064: Added default values in widgets. diffstat: modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 2 + modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS.xml | 4 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 37 ++++++++++ modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml | 12 +++ modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml | 26 +++++++ modules/org.openbravo.client.myob/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 6 + modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java | 10 ++- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 15 +++- modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 6 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 18 ++++ src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 1 + 11 files changed, 133 insertions(+), 4 deletions(-) diffs (truncated from 466 to 300 lines): diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jun 02 19:27:18 2016 +0200 @@ -13,6 +13,7 @@ <!--10DE6579FF7A4864AEB31FE957849461--> <ISSUPERCLASS><![CDATA[Y]]></ISSUPERCLASS> <!--10DE6579FF7A4864AEB31FE957849461--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--10DE6579FF7A4864AEB31FE957849461--> <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL> +<!--10DE6579FF7A4864AEB31FE957849461--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--10DE6579FF7A4864AEB31FE957849461--></OBKMO_WIDGET_CLASS> <!--E4C82D04605C4256A74258B770AA8867--><OBKMO_WIDGET_CLASS> @@ -28,6 +29,7 @@ <!--E4C82D04605C4256A74258B770AA8867--> <WIDGET_SUPERCLASS_ID><![CDATA[10DE6579FF7A4864AEB31FE957849461]]></WIDGET_SUPERCLASS_ID> <!--E4C82D04605C4256A74258B770AA8867--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--E4C82D04605C4256A74258B770AA8867--> <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL> +<!--E4C82D04605C4256A74258B770AA8867--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--E4C82D04605C4256A74258B770AA8867--></OBKMO_WIDGET_CLASS> </data> diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS.xml --- a/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS.xml Thu Jun 02 19:27:18 2016 +0200 @@ -81,6 +81,10 @@ <default/> <onCreateDefault/> </column> + <column name="AVAILABLE_IN_WORKSPACE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault><![CDATA['Y']]></onCreateDefault> + </column> <foreign-key foreignTable="AD_CLIENT" name="OBKMO_WIDGET_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 02 19:27:18 2016 +0200 @@ -621,6 +621,43 @@ <!--75B803688DF94160B79E92FABFD7033B--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--75B803688DF94160B79E92FABFD7033B--></AD_COLUMN> +<!--7D1559318B3140508C83E893EF404710--><AD_COLUMN> +<!--7D1559318B3140508C83E893EF404710--> <AD_COLUMN_ID><![CDATA[7D1559318B3140508C83E893EF404710]]></AD_COLUMN_ID> +<!--7D1559318B3140508C83E893EF404710--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7D1559318B3140508C83E893EF404710--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7D1559318B3140508C83E893EF404710--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7D1559318B3140508C83E893EF404710--> <NAME><![CDATA[Available_In_Workspace]]></NAME> +<!--7D1559318B3140508C83E893EF404710--> <COLUMNNAME><![CDATA[Available_In_Workspace]]></COLUMNNAME> +<!--7D1559318B3140508C83E893EF404710--> <AD_TABLE_ID><![CDATA[5F20F3D554CA408891C1BA6545114D4D]]></AD_TABLE_ID> +<!--7D1559318B3140508C83E893EF404710--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> +<!--7D1559318B3140508C83E893EF404710--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> +<!--7D1559318B3140508C83E893EF404710--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE> +<!--7D1559318B3140508C83E893EF404710--> <ISKEY><![CDATA[N]]></ISKEY> +<!--7D1559318B3140508C83E893EF404710--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--7D1559318B3140508C83E893EF404710--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--7D1559318B3140508C83E893EF404710--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--7D1559318B3140508C83E893EF404710--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--7D1559318B3140508C83E893EF404710--> <SEQNO><![CDATA[220]]></SEQNO> +<!--7D1559318B3140508C83E893EF404710--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--7D1559318B3140508C83E893EF404710--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--7D1559318B3140508C83E893EF404710--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--7D1559318B3140508C83E893EF404710--> <AD_ELEMENT_ID><![CDATA[8E2D37834C60447698936C888B390F9E]]></AD_ELEMENT_ID> +<!--7D1559318B3140508C83E893EF404710--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--7D1559318B3140508C83E893EF404710--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--7D1559318B3140508C83E893EF404710--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--7D1559318B3140508C83E893EF404710--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--7D1559318B3140508C83E893EF404710--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> +<!--7D1559318B3140508C83E893EF404710--> <POSITION><![CDATA[23]]></POSITION> +<!--7D1559318B3140508C83E893EF404710--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--7D1559318B3140508C83E893EF404710--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--7D1559318B3140508C83E893EF404710--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--7D1559318B3140508C83E893EF404710--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--7D1559318B3140508C83E893EF404710--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--7D1559318B3140508C83E893EF404710--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--7D1559318B3140508C83E893EF404710--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--7D1559318B3140508C83E893EF404710--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--7D1559318B3140508C83E893EF404710--></AD_COLUMN> + <!--7E8BDEF054974AB6BD23A8865636DAB4--><AD_COLUMN> <!--7E8BDEF054974AB6BD23A8865636DAB4--> <AD_COLUMN_ID><![CDATA[7E8BDEF054974AB6BD23A8865636DAB4]]></AD_COLUMN_ID> <!--7E8BDEF054974AB6BD23A8865636DAB4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml Thu Jun 02 19:27:18 2016 +0200 @@ -82,6 +82,18 @@ <!--57DD9A05462444B1A7977E7F9A94DF8A--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--57DD9A05462444B1A7977E7F9A94DF8A--></AD_ELEMENT> +<!--8E2D37834C60447698936C888B390F9E--><AD_ELEMENT> +<!--8E2D37834C60447698936C888B390F9E--> <AD_ELEMENT_ID><![CDATA[8E2D37834C60447698936C888B390F9E]]></AD_ELEMENT_ID> +<!--8E2D37834C60447698936C888B390F9E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8E2D37834C60447698936C888B390F9E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8E2D37834C60447698936C888B390F9E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8E2D37834C60447698936C888B390F9E--> <COLUMNNAME><![CDATA[Available_In_Workspace]]></COLUMNNAME> +<!--8E2D37834C60447698936C888B390F9E--> <NAME><![CDATA[Available_In_Workspace]]></NAME> +<!--8E2D37834C60447698936C888B390F9E--> <PRINTNAME><![CDATA[Available_In_Workspace]]></PRINTNAME> +<!--8E2D37834C60447698936C888B390F9E--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> +<!--8E2D37834C60447698936C888B390F9E--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--8E2D37834C60447698936C888B390F9E--></AD_ELEMENT> + <!--927D0D118B8EEF36E040A8C0CF071CF5--><AD_ELEMENT> <!--927D0D118B8EEF36E040A8C0CF071CF5--> <AD_ELEMENT_ID><![CDATA[927D0D118B8EEF36E040A8C0CF071CF5]]></AD_ELEMENT_ID> <!--927D0D118B8EEF36E040A8C0CF071CF5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml Thu Jun 02 19:27:18 2016 +0200 @@ -144,6 +144,32 @@ <!--31363A02FD05444DA8D0493110566806--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--31363A02FD05444DA8D0493110566806--></AD_FIELD> +<!--5E2FBB96AE394B12938889ACBF585D89--><AD_FIELD> +<!--5E2FBB96AE394B12938889ACBF585D89--> <AD_FIELD_ID><![CDATA[5E2FBB96AE394B12938889ACBF585D89]]></AD_FIELD_ID> +<!--5E2FBB96AE394B12938889ACBF585D89--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5E2FBB96AE394B12938889ACBF585D89--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5E2FBB96AE394B12938889ACBF585D89--> <NAME><![CDATA[Available_In_Workspace]]></NAME> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--5E2FBB96AE394B12938889ACBF585D89--> <AD_TAB_ID><![CDATA[EA867498578C4E98A4935A53A3A5F6AE]]></AD_TAB_ID> +<!--5E2FBB96AE394B12938889ACBF585D89--> <AD_COLUMN_ID><![CDATA[7D1559318B3140508C83E893EF404710]]></AD_COLUMN_ID> +<!--5E2FBB96AE394B12938889ACBF585D89--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--5E2FBB96AE394B12938889ACBF585D89--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--5E2FBB96AE394B12938889ACBF585D89--> <SEQNO><![CDATA[140]]></SEQNO> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--5E2FBB96AE394B12938889ACBF585D89--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--5E2FBB96AE394B12938889ACBF585D89--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> +<!--5E2FBB96AE394B12938889ACBF585D89--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--5E2FBB96AE394B12938889ACBF585D89--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--5E2FBB96AE394B12938889ACBF585D89--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--5E2FBB96AE394B12938889ACBF585D89--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--5E2FBB96AE394B12938889ACBF585D89--></AD_FIELD> + <!--6878AFF0F77A47F8B9702E6F1EF95FE3--><AD_FIELD> <!--6878AFF0F77A47F8B9702E6F1EF95FE3--> <AD_FIELD_ID><![CDATA[6878AFF0F77A47F8B9702E6F1EF95FE3]]></AD_FIELD_ID> <!--6878AFF0F77A47F8B9702E6F1EF95FE3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jun 02 19:27:18 2016 +0200 @@ -14,6 +14,7 @@ <!--479BC7D918D84F948F4C2BDA402D0AA3--> <WIDGET_SUPERCLASS_ID><![CDATA[C26A68FD8CF347EC9D1FB7E274622450]]></WIDGET_SUPERCLASS_ID> <!--479BC7D918D84F948F4C2BDA402D0AA3--> <CAN_MAXIMIZE><![CDATA[Y]]></CAN_MAXIMIZE> <!--479BC7D918D84F948F4C2BDA402D0AA3--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--479BC7D918D84F948F4C2BDA402D0AA3--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--479BC7D918D84F948F4C2BDA402D0AA3--></OBKMO_WIDGET_CLASS> <!--50F3F7AED43A4B31AF176F1AF0714284--><OBKMO_WIDGET_CLASS> @@ -30,6 +31,7 @@ <!--50F3F7AED43A4B31AF176F1AF0714284--> <ISSUPERCLASS><![CDATA[N]]></ISSUPERCLASS> <!--50F3F7AED43A4B31AF176F1AF0714284--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--50F3F7AED43A4B31AF176F1AF0714284--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--50F3F7AED43A4B31AF176F1AF0714284--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--50F3F7AED43A4B31AF176F1AF0714284--></OBKMO_WIDGET_CLASS> <!--C26A68FD8CF347EC9D1FB7E274622450--><OBKMO_WIDGET_CLASS> @@ -45,6 +47,7 @@ <!--C26A68FD8CF347EC9D1FB7E274622450--> <ISSUPERCLASS><![CDATA[Y]]></ISSUPERCLASS> <!--C26A68FD8CF347EC9D1FB7E274622450--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--C26A68FD8CF347EC9D1FB7E274622450--> <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL> +<!--C26A68FD8CF347EC9D1FB7E274622450--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--C26A68FD8CF347EC9D1FB7E274622450--></OBKMO_WIDGET_CLASS> <!--E9DA175470B747268E09DEF5174FDD3A--><OBKMO_WIDGET_CLASS> @@ -61,6 +64,7 @@ <!--E9DA175470B747268E09DEF5174FDD3A--> <WIDGET_SUPERCLASS_ID><![CDATA[C26A68FD8CF347EC9D1FB7E274622450]]></WIDGET_SUPERCLASS_ID> <!--E9DA175470B747268E09DEF5174FDD3A--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--E9DA175470B747268E09DEF5174FDD3A--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--E9DA175470B747268E09DEF5174FDD3A--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--E9DA175470B747268E09DEF5174FDD3A--></OBKMO_WIDGET_CLASS> <!--F41E327965084556BCF7EC7B271603AA--><OBKMO_WIDGET_CLASS> @@ -77,6 +81,7 @@ <!--F41E327965084556BCF7EC7B271603AA--> <ISSUPERCLASS><![CDATA[Y]]></ISSUPERCLASS> <!--F41E327965084556BCF7EC7B271603AA--> <CAN_MAXIMIZE><![CDATA[Y]]></CAN_MAXIMIZE> <!--F41E327965084556BCF7EC7B271603AA--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--F41E327965084556BCF7EC7B271603AA--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--F41E327965084556BCF7EC7B271603AA--></OBKMO_WIDGET_CLASS> <!--FF8080812E144FAE012E1455F6020009--><OBKMO_WIDGET_CLASS> @@ -92,6 +97,7 @@ <!--FF8080812E144FAE012E1455F6020009--> <ISSUPERCLASS><![CDATA[N]]></ISSUPERCLASS> <!--FF8080812E144FAE012E1455F6020009--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--FF8080812E144FAE012E1455F6020009--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--FF8080812E144FAE012E1455F6020009--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--FF8080812E144FAE012E1455F6020009--></OBKMO_WIDGET_CLASS> </data> diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java --- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java Thu Jun 02 19:27:18 2016 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2015 Openbravo SLU + * All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -182,8 +182,14 @@ private void addAvailableWidgetClasses(JSONObject o, String roleId, boolean isAdminMode) { MyOpenbravoComponent component = weldUtils.getInstance(MyOpenbravoComponent.class); + List<String> availableClasses = null; try { - List<String> availableClasses = component.getAvailableWidgetClasses(roleId, isAdminMode); + final String strEventType = o.getString("eventType"); + if (GET_AVAILABLE_WIDGET_CLASSES.equals(strEventType)) { + availableClasses = component.getAvailableWidgetClasses(roleId, isAdminMode, true); + } else { + availableClasses = component.getAvailableWidgetClasses(roleId, isAdminMode); + } o.put("availableWidgetClasses", availableClasses); } catch (Exception e) { log.error("Error retreiving widget classes", e); diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java --- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java Thu Jun 02 19:27:18 2016 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2014 Openbravo SLU + * All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -96,6 +96,12 @@ public List<String> getAvailableWidgetClasses(String roleId, boolean isAdminMode) throws Exception { + boolean shouldBeDisplayedInWorkspace = false; + return getAvailableWidgetClasses(roleId, isAdminMode, shouldBeDisplayedInWorkspace); + } + + public List<String> getAvailableWidgetClasses(String roleId, boolean isAdminMode, + boolean shouldBeDisplayed) throws Exception { OBContext.setAdminMode(); try { if (widgetClassDefinitions != null) { @@ -105,8 +111,13 @@ final List<JSONObject> definitions = new ArrayList<JSONObject>(); final List<String> tmp = new ArrayList<String>(); String classDef = ""; + String strConditionQuery = WidgetClass.PROPERTY_SUPERCLASS + " is false"; + if (shouldBeDisplayed) { + strConditionQuery += " and " + WidgetClass.PROPERTY_AVAILABLEINWORKSPACE + " is true"; + } + final OBQuery<WidgetClass> widgetClassesQry = OBDal.getInstance().createQuery( - WidgetClass.class, WidgetClass.PROPERTY_SUPERCLASS + " is false"); + WidgetClass.class, strConditionQuery); for (WidgetClass widgetClass : widgetClassesQry.list()) { if (isAccessible(widgetClass, roleId)) { final WidgetProvider widgetProvider = myOBUtils.getWidgetProvider(widgetClass); diff -r c265570e1b9d -r 4cb4e1989316 modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml --- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jun 02 12:51:40 2016 +0200 +++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jun 02 19:27:18 2016 +0200 @@ -14,6 +14,7 @@ <!--147D825456D54D0486C3D7072531C5C9--> <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID> <!--147D825456D54D0486C3D7072531C5C9--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--147D825456D54D0486C3D7072531C5C9--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--147D825456D54D0486C3D7072531C5C9--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--147D825456D54D0486C3D7072531C5C9--></OBKMO_WIDGET_CLASS> <!--2662490B7D3B4F80AF308C88F6DB68C0--><OBKMO_WIDGET_CLASS> @@ -30,6 +31,7 @@ <!--2662490B7D3B4F80AF308C88F6DB68C0--> <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID> <!--2662490B7D3B4F80AF308C88F6DB68C0--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--2662490B7D3B4F80AF308C88F6DB68C0--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--2662490B7D3B4F80AF308C88F6DB68C0--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--2662490B7D3B4F80AF308C88F6DB68C0--></OBKMO_WIDGET_CLASS> <!--2A32CF26F3F64FE39C7F94E9D82497D1--><OBKMO_WIDGET_CLASS> @@ -45,6 +47,7 @@ <!--2A32CF26F3F64FE39C7F94E9D82497D1--> <ISSUPERCLASS><![CDATA[Y]]></ISSUPERCLASS> <!--2A32CF26F3F64FE39C7F94E9D82497D1--> <CAN_MAXIMIZE><![CDATA[Y]]></CAN_MAXIMIZE> <!--2A32CF26F3F64FE39C7F94E9D82497D1--> <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL> +<!--2A32CF26F3F64FE39C7F94E9D82497D1--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--2A32CF26F3F64FE39C7F94E9D82497D1--></OBKMO_WIDGET_CLASS> <!--34F279BBB85945519DC38F21573106C0--><OBKMO_WIDGET_CLASS> @@ -61,6 +64,7 @@ <!--34F279BBB85945519DC38F21573106C0--> <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID> <!--34F279BBB85945519DC38F21573106C0--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--34F279BBB85945519DC38F21573106C0--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--34F279BBB85945519DC38F21573106C0--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--34F279BBB85945519DC38F21573106C0--></OBKMO_WIDGET_CLASS> <!--8267FB3F59D7401980DDDEFF51FE55C3--><OBKMO_WIDGET_CLASS> @@ -77,6 +81,7 @@ <!--8267FB3F59D7401980DDDEFF51FE55C3--> <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID> <!--8267FB3F59D7401980DDDEFF51FE55C3--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--8267FB3F59D7401980DDDEFF51FE55C3--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--8267FB3F59D7401980DDDEFF51FE55C3--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--8267FB3F59D7401980DDDEFF51FE55C3--></OBKMO_WIDGET_CLASS> <!--F8E4F382BCFB441CADBB4AC693C41C93--><OBKMO_WIDGET_CLASS> ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
