details: /erp/devel/main/rev/7b499d87c794 changeset: 11130:7b499d87c794 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Mar 09 09:59:28 2011 +0100 summary: Added deep link button and popup window and deep link logic
details: /erp/devel/main/rev/362e1eb87492 changeset: 11131:362e1eb87492 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Mar 09 10:41:14 2011 +0100 summary: CI: merge back from main details: /erp/devel/main/rev/25c237658226 changeset: 11132:25c237658226 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Mar 09 11:07:18 2011 +0100 summary: Fixed export CSV functionality so that it works with new filtering system details: /erp/devel/main/rev/1a6fae737f2b changeset: 11133:1a6fae737f2b user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Mar 09 12:16:19 2011 +0100 summary: CI: update AD_MODULE to version 11132 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 33 +++ modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js | 34 ++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js | 32 +++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js | 85 +++++++++- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js | 1 - modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-toolbar-styles.css | 6 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-toolbar-styles.js | 3 - modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 16 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 14 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- 45 files changed, 276 insertions(+), 84 deletions(-) diffs (truncated from 1108 to 300 lines): diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 09 12:16:19 2011 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.10964]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.11132]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 09 12:16:19 2011 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.10964]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.11132]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.10964]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.11132]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 09 12:16:19 2011 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.10964]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.11132]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 09 12:16:19 2011 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.10964]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.11132]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Mar 09 12:16:19 2011 +0100 @@ -1542,4 +1542,37 @@ <!--FF8081812E912BB3012E9144BF08009F--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF8081812E912BB3012E9144BF08009F--></AD_MESSAGE> +<!--FF8081812E99943C012E99C86806004D--><AD_MESSAGE> +<!--FF8081812E99943C012E99C86806004D--> <AD_MESSAGE_ID><![CDATA[FF8081812E99943C012E99C86806004D]]></AD_MESSAGE_ID> +<!--FF8081812E99943C012E99C86806004D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8081812E99943C012E99C86806004D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8081812E99943C012E99C86806004D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8081812E99943C012E99C86806004D--> <VALUE><![CDATA[OBUIAPP_URL]]></VALUE> +<!--FF8081812E99943C012E99C86806004D--> <MSGTEXT><![CDATA[URL]]></MSGTEXT> +<!--FF8081812E99943C012E99C86806004D--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--FF8081812E99943C012E99C86806004D--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF8081812E99943C012E99C86806004D--></AD_MESSAGE> + +<!--FF8081812E99943C012E99C8B0500050--><AD_MESSAGE> +<!--FF8081812E99943C012E99C8B0500050--> <AD_MESSAGE_ID><![CDATA[FF8081812E99943C012E99C8B0500050]]></AD_MESSAGE_ID> +<!--FF8081812E99943C012E99C8B0500050--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8081812E99943C012E99C8B0500050--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8081812E99943C012E99C8B0500050--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8081812E99943C012E99C8B0500050--> <VALUE><![CDATA[OBUIAPP_Document_Link]]></VALUE> +<!--FF8081812E99943C012E99C8B0500050--> <MSGTEXT><![CDATA[Document Link]]></MSGTEXT> +<!--FF8081812E99943C012E99C8B0500050--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--FF8081812E99943C012E99C8B0500050--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF8081812E99943C012E99C8B0500050--></AD_MESSAGE> + +<!--FF8081812E99943C012E99C9668A0055--><AD_MESSAGE> +<!--FF8081812E99943C012E99C9668A0055--> <AD_MESSAGE_ID><![CDATA[FF8081812E99943C012E99C9668A0055]]></AD_MESSAGE_ID> +<!--FF8081812E99943C012E99C9668A0055--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8081812E99943C012E99C9668A0055--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8081812E99943C012E99C9668A0055--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8081812E99943C012E99C9668A0055--> <VALUE><![CDATA[OBUIAPP_GetDirectLink]]></VALUE> +<!--FF8081812E99943C012E99C9668A0055--> <MSGTEXT><![CDATA[Get a direct link to this view or record]]></MSGTEXT> +<!--FF8081812E99943C012E99C9668A0055--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--FF8081812E99943C012E99C9668A0055--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF8081812E99943C012E99C9668A0055--></AD_MESSAGE> + </data> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 09 12:16:19 2011 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.10964]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.11132]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Mar 09 12:16:19 2011 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.10961]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.11132]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.10961]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.11132]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.10964]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.11132]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.10961]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.11132]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js Wed Mar 09 12:16:19 2011 +0100 @@ -207,6 +207,8 @@ leftMemberButtons.push(isc.OBToolbarIconButton.create(this.iconToolbarButtons[i])); } } + // and add the direct link at the end + leftMemberButtons.push(isc.OBToolbarIconButton.create(isc.OBToolbar.LINK_BUTTON_PROPERTIES)); this.toolBar = isc.OBToolbar.create({ view: this, @@ -462,6 +464,38 @@ } }, + getDirectLinkUrl: function() { + var url = window.location.href; + var qIndex = url.indexOf('?'); + var dIndex = url.indexOf('#'); + var index = -1; + if (dIndex != -1 && qIndex != -1) { + if (dIndex < qIndex) { + index = dIndex; + } else { + index = qIndex; + } + } else if (qIndex != -1) { + index = qIndex; + } else if (dIndex != -1) { + index = dIndex; + } + if (index != -1) { + url = url.substring(0, index); + } + + url = url + '?tabId=' + this.tabId; + if (this.isShowingForm) { + if (this.viewForm.isNew && this.isRootView) { + url = url + '&command=NEW'; + } else if (!this.viewForm.isNew) { + url = url + '&recordId=' + this.viewGrid.getSelectedRecord().id; + } + } + + return url; + }, + // ** {{{ addChildView }}} ** // The addChildView creates the child tab and sets the pointer back to // this diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js Wed Mar 09 12:16:19 2011 +0100 @@ -222,6 +222,38 @@ }, keyboardShortcutId: 'ToolBar_Export' }, + LINK_BUTTON_PROPERTIES: { + action: function(){ + var url = this.view.getDirectLinkUrl(); + var form = isc.OBViewForm.create({ + width: 390, + height: 1, + overflow: 'visible', + fields: [{ + type: 'OBTextAreaItem', selectOnFocus: true, + width: 390, height: 50, canFocus: true, + name:'url', + title: OB.I18N.getLabel('OBUIAPP_URL'), value: url} + ], + show: function() { + var fld = this.getFields()[0]; + this.setFocusItem(fld); + this.Super('show', arguments); + // do the focus with a delay to give the popup time to draw + this.fireOnPause('link_button_show', this.focus, 50, this); + } + }); + var dialog = OB.Utilities.createDialog(OB.I18N.getLabel('OBUIAPP_Document_Link')); + dialog.setContent(form); + dialog.show(); + }, + disabled: false, + buttonType: 'link', + prompt: OB.I18N.getLabel('OBUIAPP_GetDirectLink'), + updateState: function(){ + }, + keyboardShortcutId: 'ToolBar_Link' + }, // This offers a mechanism to add properties at runtime to buttons created through // templates and java BUTTON_PROPERTIES: { diff -r 78bdd4129fe5 -r 1a6fae737f2b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js Wed Mar 09 00:28:31 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js Wed Mar 09 12:16:19 2011 +0100 @@ -21,6 +21,83 @@ // are related to opening views, opening popups, displaying yes/no, etc. OB.Utilities = {}; +// ** {{{OB.Utilities.createDialog}}} ** +// Creates a dialog with a title, an ok button and a layout in the middle. +// The dialog is not shown but returned. The caller needs to call setContent to +// set the content in the dialog and show it. +OB.Utilities.createDialog = function(title, focusOnOKButton, properties){ + var dialog = isc.Dialog.create({ + title: title, + toolbarButtons: [isc.Dialog.OK], + isModal: true, + canDragReposition: true, + keepInParentRect: true, + autoSize: true, + autoCenter: true, + + contentLayout: 'horizontal', + autoChildParentMap: isc.addProperties({}, isc.Window.getInstanceProperty("autoChildParentMap"), { + stack: 'body', + layout: 'stack', + toolbar: 'stack' + }), + + stackDefaults: { + height: 1 + }, + + toolbarDefaults: isc.addProperties({}, isc.Dialog.getInstanceProperty("toolbarDefaults"), { + layoutAlign: 'center', + buttonConstructor: isc.OBFormButton + }), + + createChildren: function(){ + this.showToolbar = false; + this.Super('createChildren'); + this.addAutoChild('stack', null, isc.VStack); + this.addAutoChild('layout', { + height: 1, + width: '100%', + overflow: 'visible' + }, isc.VLayout); + this.showToolbar = true; + this.makeToolbar(); + + // can't be done via defaults because policy and direction are dynamically determined + this.body.hPolicy = 'fill'; + }, + + // will set the content and show it + setContent: function(content){ + + // Note: we lazily create children on draw, so verify that the items have been + // initialized before manipulating the label ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits