details: /erp/devel/pi/rev/6ab82961bf8c
changeset: 11543:6ab82961bf8c
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Apr 07 13:42:28 2011 +0200
summary: Fixes issue 16686: Added widgetInstanceId to default properties
- widgetInstanceId is now a default widget property
- About info and parameters are pulled from the widget definition
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 1 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diffs (28 lines):
diff -r db4e342ac247 -r 6ab82961bf8c
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Thu Apr 07 13:03:03 2011 +0200
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Thu Apr 07 13:42:28 2011 +0200
@@ -230,6 +230,7 @@
protected void addDefaultWidgetProperties(JSONObject jsonObject,
WidgetInstance widgetInstance)
throws JSONException {
+ jsonObject.put(WIDGETCLASSID, widgetInstance.getWidgetClass().getId());
jsonObject.put(MyOpenbravoWidgetComponent.CLASSNAMEPARAMETER,
myOBUtils.getWidgetProvider(
widgetClass).getClientSideWidgetClassName());
jsonObject.put(DBINSTANCEID, widgetInstance.getId());
diff -r db4e342ac247 -r 6ab82961bf8c
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
Thu Apr 07 13:03:03 2011 +0200
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
Thu Apr 07 13:42:28 2011 +0200
@@ -517,7 +517,12 @@
localWidgetProperties.showMaximizeButton =
this.availableWidgetClasses[i].showMaximizeButton;
localWidgetProperties.menuItems =
this.availableWidgetClasses[i].menuItems;
localWidgetProperties.fieldDefinitions =
this.availableWidgetClasses[i].fieldDefinitions;
- localWidgetProperties.widgetClassId =
this.availableWidgetClasses[i].widgetClassId;
+ if(!localWidgetProperties.aboutFieldDefinitions) {
+ localWidgetProperties.aboutFieldDefinitions =
this.availableWidgetClasses[i].aboutFieldDefinitions;
+ }
+ if(!localWidgetProperties.parameters) {
+ localWidgetProperties.parameters = isc.addProperties({},
widgetProperties.parameters);
+ }
break;
}
}
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
