details: https://code.openbravo.com/erp/devel/pi/rev/9a1b39822915 changeset: 13373:9a1b39822915 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 01 12:00:27 2011 +0200 summary: Issue 18077: Added OBUIAPP_Menu_Parameters to dataset AD
details: https://code.openbravo.com/erp/devel/pi/rev/028d33772d40 changeset: 13374:028d33772d40 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 01 19:04:47 2011 +0200 summary: Issue 18077: Moved hard-coded text to DB messages details: https://code.openbravo.com/erp/devel/pi/rev/00a5ffa92ae2 changeset: 13375:00a5ffa92ae2 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 01 19:43:33 2011 +0200 summary: Issue 18077: Fixes merge problem - AD_DATASET_TABLE details: https://code.openbravo.com/erp/devel/pi/rev/db596e1cae07 changeset: 13376:db596e1cae07 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 01 19:44:15 2011 +0200 summary: Issue 18077: Added suppor for OpenID details: https://code.openbravo.com/erp/devel/pi/rev/061e041754e6 changeset: 13377:061e041754e6 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 01 19:46:56 2011 +0200 summary: Fixes issue 18077: Added support for login in with Google Account details: https://code.openbravo.com/erp/devel/pi/rev/7a57441f53b3 changeset: 13378:7a57441f53b3 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 01 19:48:46 2011 +0200 summary: Issue 18077: Merge heads diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_DATASET_TABLE.xml | 29 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 13 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 4 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 11 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js | 2 +- modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_REFERENCE.xml | 59 + modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml | 70 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 338 +++++++ modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml | 13 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml | 157 +++ modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_REFERENCE.xml | 16 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TAB.xml | 24 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TABLE.xml | 20 + modules/org.openbravo.client.myob/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 13 + modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java | 2 + modules/org.openbravo.client.myob/src/org/openbravo/client/myob/widgetinform/WidgetInFormUIDefinition.java | 63 + modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js | 60 + modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js | 3 + modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js | 23 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 53 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 21 + modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml | 46 + modules/org.openbravo.service.integration.google/src-db/database/model/tables/OBSEIG_DEFAULTS.xml | 61 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml | 373 ++++++++ modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_ELEMENT.xml | 27 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_EP_PROCEDURES.xml | 13 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_FIELD.xml | 183 ++++ modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MENU.xml | 28 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml | 84 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 16 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 24 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml | 12 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 31 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_PACKAGE.xml | 13 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TAB.xml | 26 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TABLE.xml | 23 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TREENODE.xml | 25 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml | 18 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml | 27 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml | 13 + modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java | 439 ++++++++++ modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleIntegrationComponentProvider.java | 60 + modules/org.openbravo.service.integration.google/web/images/google.png | 0 modules/org.openbravo.service.integration.google/web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js | 64 + modules/org.openbravo.service.integration.openid/lib/runtime/guice-2.0.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/httpclient-4.0.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/httpcore-4.0.1.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/openid4java-0.9.6.jar | 0 modules/org.openbravo.service.integration.openid/src-db/database/model/tables/OBSOID_USER_IDENTIFIER.xml | 55 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_COLUMN.xml | 336 +++++++ modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_ELEMENT.xml | 25 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_FIELD.xml | 156 +++ modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 25 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml | 12 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 17 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_PACKAGE.xml | 13 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TAB.xml | 26 + modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TABLE.xml | 23 + modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java | 256 +++++ modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 42 +- src-db/database/model/functions/AD_TABLE_IMPORT.xml | 29 +- src/org/openbravo/erpCommon/security/Login.java | 12 +- 71 files changed, 3616 insertions(+), 89 deletions(-) diffs (truncated from 4376 to 300 lines): diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Mon Aug 01 19:48:46 2011 +0200 @@ -17,7 +17,7 @@ <!--0060401C958644D4AA38E9226FBEE232--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--0060401C958644D4AA38E9226FBEE232--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--0060401C958644D4AA38E9226FBEE232--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--0060401C958644D4AA38E9226FBEE232--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--0060401C958644D4AA38E9226FBEE232--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--0060401C958644D4AA38E9226FBEE232--> <SEQNO><![CDATA[130]]></SEQNO> <!--0060401C958644D4AA38E9226FBEE232--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--0060401C958644D4AA38E9226FBEE232--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -3808,7 +3808,7 @@ <!--B4FD9EC573F94B9096FF3A41284F338F--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--B4FD9EC573F94B9096FF3A41284F338F--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--B4FD9EC573F94B9096FF3A41284F338F--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--B4FD9EC573F94B9096FF3A41284F338F--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--B4FD9EC573F94B9096FF3A41284F338F--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--B4FD9EC573F94B9096FF3A41284F338F--> <SEQNO><![CDATA[110]]></SEQNO> <!--B4FD9EC573F94B9096FF3A41284F338F--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--B4FD9EC573F94B9096FF3A41284F338F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -3875,7 +3875,7 @@ <!--BB39498850B942A1B29086C89163F014--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--BB39498850B942A1B29086C89163F014--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--BB39498850B942A1B29086C89163F014--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--BB39498850B942A1B29086C89163F014--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--BB39498850B942A1B29086C89163F014--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--BB39498850B942A1B29086C89163F014--> <SEQNO><![CDATA[140]]></SEQNO> <!--BB39498850B942A1B29086C89163F014--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--BB39498850B942A1B29086C89163F014--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -3909,7 +3909,7 @@ <!--BBA0362A5E424CDDBFA2A008A942F218--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--BBA0362A5E424CDDBFA2A008A942F218--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--BBA0362A5E424CDDBFA2A008A942F218--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--BBA0362A5E424CDDBFA2A008A942F218--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--BBA0362A5E424CDDBFA2A008A942F218--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> <!--BBA0362A5E424CDDBFA2A008A942F218--> <SEQNO><![CDATA[170]]></SEQNO> <!--BBA0362A5E424CDDBFA2A008A942F218--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> <!--BBA0362A5E424CDDBFA2A008A942F218--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_DATASET_TABLE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_DATASET_TABLE.xml Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_DATASET_TABLE.xml Mon Aug 01 19:48:46 2011 +0200 @@ -42,6 +42,35 @@ <!--74B0D35B8E54480ABBCBD0C930BA7399--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--74B0D35B8E54480ABBCBD0C930BA7399--></AD_DATASET_TABLE> +<!--FF8081813185C265013185C8D7AE000E--><AD_DATASET_TABLE> +<!--FF8081813185C265013185C8D7AE000E--> <AD_DATASET_TABLE_ID><![CDATA[FF8081813185C265013185C8D7AE000E]]></AD_DATASET_TABLE_ID> +<!--FF8081813185C265013185C8D7AE000E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8081813185C265013185C8D7AE000E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8081813185C265013185C8D7AE000E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8081813185C265013185C8D7AE000E--> <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID> +<!--FF8081813185C265013185C8D7AE000E--> <AD_TABLE_ID><![CDATA[FF8081813157AED2013157B1F75F0007]]></AD_TABLE_ID> +<!--FF8081813185C265013185C8D7AE000E--> <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS> +<!--FF8081813185C265013185C8D7AE000E--> <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE> +<!--FF8081813185C265013185C8D7AE000E--> <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO> +<!--FF8081813185C265013185C8D7AE000E--> <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT> +<!--FF8081813185C265013185C8D7AE000E--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF8081813185C265013185C8D7AE000E--> <SECONDARYWHERECLAUSE><![CDATA[ad_module_id is not null]]></SECONDARYWHERECLAUSE> +<!--FF8081813185C265013185C8D7AE000E--></AD_DATASET_TABLE> + +<!--FF8081813185C265013185CA5FE90015--><AD_DATASET_TABLE> +<!--FF8081813185C265013185CA5FE90015--> <AD_DATASET_TABLE_ID><![CDATA[FF8081813185C265013185CA5FE90015]]></AD_DATASET_TABLE_ID> +<!--FF8081813185C265013185CA5FE90015--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8081813185C265013185CA5FE90015--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8081813185C265013185CA5FE90015--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8081813185C265013185CA5FE90015--> <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID> +<!--FF8081813185C265013185CA5FE90015--> <AD_TABLE_ID><![CDATA[FF8081813157AED2013157B1F75F0007]]></AD_TABLE_ID> +<!--FF8081813185C265013185CA5FE90015--> <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS> +<!--FF8081813185C265013185CA5FE90015--> <WHERECLAUSE><![CDATA[ad_client_id='0' and ad_module_id is null]]></WHERECLAUSE> +<!--FF8081813185C265013185CA5FE90015--> <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO> +<!--FF8081813185C265013185CA5FE90015--> <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT> +<!--FF8081813185C265013185CA5FE90015--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF8081813185C265013185CA5FE90015--></AD_DATASET_TABLE> + <!--FF98CEB6C3BF4FEF8E3B098D8E23B2CF--><AD_DATASET_TABLE> <!--FF98CEB6C3BF4FEF8E3B098D8E23B2CF--> <AD_DATASET_TABLE_ID><![CDATA[FF98CEB6C3BF4FEF8E3B098D8E23B2CF]]></AD_DATASET_TABLE_ID> <!--FF98CEB6C3BF4FEF8E3B098D8E23B2CF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r c087bb4d81c2 -r 7a57441f53b3 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 Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Aug 01 19:48:46 2011 +0200 @@ -1406,7 +1406,7 @@ <!--FF80808131509CDA013150B7DBF30021--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80808131509CDA013150B7DBF30021--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80808131509CDA013150B7DBF30021--> <VALUE><![CDATA[OBUIAPP_ImageFile]]></VALUE> -<!--FF80808131509CDA013150B7DBF30021--> <MSGTEXT><![CDATA[Image File]]></MSGTEXT> +<!--FF80808131509CDA013150B7DBF30021--> <MSGTEXT><![CDATA[File]]></MSGTEXT> <!--FF80808131509CDA013150B7DBF30021--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF80808131509CDA013150B7DBF30021--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF80808131509CDA013150B7DBF30021--></AD_MESSAGE> @@ -2893,4 +2893,15 @@ <!--FF8081813185119C01318523CEE7001D--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF8081813185119C01318523CEE7001D--></AD_MESSAGE> +<!--FF8081813185C265013185C79DBA0005--><AD_MESSAGE> +<!--FF8081813185C265013185C79DBA0005--> <AD_MESSAGE_ID><![CDATA[FF8081813185C265013185C79DBA0005]]></AD_MESSAGE_ID> +<!--FF8081813185C265013185C79DBA0005--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8081813185C265013185C79DBA0005--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8081813185C265013185C79DBA0005--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8081813185C265013185C79DBA0005--> <VALUE><![CDATA[OBUIAPP_Personalization_Toolbar_Delete]]></VALUE> +<!--FF8081813185C265013185C79DBA0005--> <MSGTEXT><![CDATA[Delete the personalized layout, personalized layouts can only be deleted by the user themselves.]]></MSGTEXT> +<!--FF8081813185C265013185C79DBA0005--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--FF8081813185C265013185C79DBA0005--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF8081813185C265013185C79DBA0005--></AD_MESSAGE> + </data> diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java Mon Aug 01 19:48:46 2011 +0200 @@ -44,7 +44,7 @@ */ @ApplicationScoped public class WindowSettingsActionHandler extends BaseActionHandler { - private static final Logger log4j = Logger.getLogger(PersonalizationHandler.class); + private static final Logger log4j = Logger.getLogger(WindowSettingsActionHandler.class); @Inject private PersonalizationHandler personalizationHandler; diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java Mon Aug 01 19:48:46 2011 +0200 @@ -63,7 +63,7 @@ protected JSONObject execute(Map<String, Object> parameters, String data) { try { - OBContext.setAdminMode(); + OBContext.setAdminMode(false); if (!parameters.containsKey(ACTION)) { throw new IllegalStateException("Mandatory parameter " + ACTION + " not present"); } diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java Mon Aug 01 19:48:46 2011 +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-2011 Openbravo SLU + * All portions are Copyright (C) 2011 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -59,7 +59,7 @@ * @return the personalization settings in a json object for a window. */ public JSONObject getPersonalizationForWindow(Window window) { - OBContext.setAdminMode(); + OBContext.setAdminMode(false); try { final JSONObject result = new JSONObject(); for (Tab tab : window.getADTabList()) { @@ -95,7 +95,7 @@ * @return the personalization settings in a json object for this tab. */ public UIPersonalization getPersonalizationForTab(Tab tab) { - OBContext.setAdminMode(); + OBContext.setAdminMode(false); try { return getPersonalization(OBContext.getOBContext().getCurrentClient().getId(), OBContext .getOBContext().getCurrentOrganization().getId(), OBContext.getOBContext().getRole() @@ -109,7 +109,7 @@ public UIPersonalization getPersonalization(String clientId, String orgId, String roleId, String userId, String tabId, boolean exactMatch) { - OBContext.setAdminMode(); + OBContext.setAdminMode(false); try { final List<UIPersonalization> pers = getPersonalizations(clientId, orgId, userId, roleId, tabId, exactMatch); @@ -186,7 +186,7 @@ */ public UIPersonalization storePersonalization(String persId, String clientId, String orgId, String roleId, String userId, String tabId, String target, String value) { - OBContext.setAdminMode(); + OBContext.setAdminMode(false); try { UIPersonalization uiPersonalization; if (persId != null) { diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js Mon Aug 01 19:48:46 2011 +0200 @@ -198,10 +198,6 @@ } }, - doSelectElement: function() { - this.Super('doSelectElement', [this.dateTextField]); - }, - // update the value in update value as this is called from cellEditEnd in the // grid updateValue: function() { diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Mon Aug 01 19:48:46 2011 +0200 @@ -115,7 +115,9 @@ width: '100%' }); this.imageLayout.addMember(this.image); - this.image.setSrc('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png'); + this.image.setSrc(this.imageNotAvailableSrc); + this.image.setHeight(this.imageNotAvailableHeight); + this.image.setWidth(this.imageNotAvailableWidth); var buttonLayout = isc.VLayout.create({ width: '1%' }); @@ -266,9 +268,6 @@ addForm: null, showMinimizeButton : false, showMaximizeButton : false, - height: '40px', - width: '200px', - align: 'center', title: OB.I18N.getLabel('OBUIAPP_ImageSelectorTitle'), initWidget: function(args){ var imageId = this.imageItem.getValue(); diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Mon Aug 01 19:48:46 2011 +0200 @@ -681,6 +681,14 @@ delete this.getFields()[i]._changedByFic; } + // refresh WidgetInForm fields if present (as they might depend on data of current record) + for (i = 0; i < this.getFields().length; i++) { + var locField = this.getFields()[i]; + if (locField.hasOwnProperty("widgetClassId")) { + locField.refresh(this); + } + } + this.markForRedraw(); delete this.inFicCall; diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Mon Aug 01 19:48:46 2011 +0200 @@ -291,6 +291,17 @@ return ret; }, + // destroy the context menu also + // see why this needs to be done in the + // documentation of canvas.contextMenu in Canvas.js + destroy: function() { + if (this.contextMenu) { + this.contextMenu.destroy(); + this.contextMenu = null; + } + this.Super('destroy', arguments); + }, + setData: function(data) { data.grid = this; this.Super('setData', arguments); diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js --- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js Mon Aug 01 19:48:46 2011 +0200 @@ -23,6 +23,7 @@ * 2) OBImageItem * 3) SectionItem Button Styles * 3) Attachments Styles + * 4) Image Popup Styles =======================================================================*/ /* ===================================================================== @@ -502,4 +503,15 @@ height: 30, width: 450, align: 'center' -}); \ No newline at end of file +}); + + /* ===================================================================== + * Image Popup Styles + =======================================================================*/ + + isc.OBImageSelector.addProperties({ + hlayoutTopMargin: 10, + height: 30, + width: 450, + align: 'center' + }); \ No newline at end of file diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js --- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js Mon Aug 01 15:51:20 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js Mon Aug 01 19:48:46 2011 +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 Openbravo SLU + * All portions are Copyright (C) 2011 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ diff -r c087bb4d81c2 -r 7a57441f53b3 modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_REFERENCE.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_REFERENCE.xml Mon Aug 01 19:48:46 2011 +0200 ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
