details: /erp/devel/pi/rev/e0e2d3bd1013
changeset: 10148:e0e2d3bd1013
user: Asier Galdos <asier.galdos <at> almis.com>
date: Wed Jan 26 16:17:48 2011 +0100
summary: Fixes issue 15231. Ignore field definitions for URLWidget.
details: /erp/devel/pi/rev/e7f2a7b320ff
changeset: 10149:e7f2a7b320ff
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Jan 26 17:55:33 2011 +0100
summary: Merge changes from branch pi-agaldos
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
| 6 +++++-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
| 5 +++++
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 2 +-
src-db/database/sourcedata/AD_TAB.xml
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
| 4 ++--
5 files changed, 14 insertions(+), 5 deletions(-)
diffs (76 lines):
diff -r 0d3bd59d94da -r e7f2a7b320ff
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
Wed Jan 26 17:55:33 2011 +0100
@@ -345,7 +345,11 @@
areParamsSet: false,
isFramesetDraw: false,
isLoaded: false,
- htmlCode: '<html><head></head><frameset cols="*, 0%" rows="*"
frameborder="no" border="0" framespacing="0"><frame
id="MDIPopupContainer"></frame></frameset><body></body></html>',
+ htmlCode: '<html><head></head><frameset cols="*, 0%" rows="*"
frameborder="no" border="0" framespacing="0">'+
+ '<frame id="MDIPopupContainer"></frame>'+
+ '<frame name="frameMenu" scrolling="no" src="' +
OB.Application.contextUrl +
+ 'utility/VerticalMenu.html" id="paramFrameMenuLoading"></frame>'+
+ '</frameset><body></body></html>',
popupURL: url
});
cPopup.show();
diff -r 0d3bd59d94da -r e7f2a7b320ff
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
Wed Jan 26 17:55:33 2011 +0100
@@ -19,6 +19,7 @@
package org.openbravo.client.myob;
import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.exception.OBException;
@@ -51,6 +52,10 @@
final JSONObject parameters = new JSONObject();
jsonObject.put(WidgetProvider.PARAMETERS, parameters);
parameters.put(SRC,
getWidgetClass().getOBKMOWidgetURLList().get(0).getURL());
+ if (jsonObject.getJSONArray(WidgetProvider.FIELDDEFINITIONS).length() >
0) {
+ log.warn("URLWidget does not support parameters. Ignoring field
definitions.");
+ jsonObject.put(WidgetProvider.FIELDDEFINITIONS, new JSONArray());
+ }
return jsonObject;
} catch (Exception e) {
throw new OBException(e);
diff -r 0d3bd59d94da -r e7f2a7b320ff
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
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Wed Jan 26 17:55:33 2011 +0100
@@ -71,7 +71,7 @@
private static final String HEIGHT = "height";
private static final String PRIORITY = "priority";
protected static final String PARAMETERS = "parameters";
- private static final String FIELDDEFINITIONS = "fieldDefinitions";
+ protected static final String FIELDDEFINITIONS = "fieldDefinitions";
private static final String ITEMDATA = "itemData";
private static final String PARAMETERID = "parameterId";
private static final String PARAMETERNAME = "name";
diff -r 0d3bd59d94da -r e7f2a7b320ff src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Wed Jan 26 14:02:30 2011 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml Wed Jan 26 17:55:33 2011 +0100
@@ -1228,7 +1228,7 @@
<!--167--> <HASTREE><![CDATA[N]]></HASTREE>
<!--167--> <PROCESSING><![CDATA[N]]></PROCESSING>
<!--167--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
-<!--167--> <FILTERCLAUSE><![CDATA[C_DocType.IsActive=Y]]></FILTERCLAUSE>
+<!--167--> <FILTERCLAUSE><![CDATA[C_DocType.IsActive='Y']]></FILTERCLAUSE>
<!--167--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--167--> <UIPATTERN><![CDATA[STD]]></UIPATTERN>
<!--167--> <HQLFILTERCLAUSE><![CDATA[e.active='Y']]></HQLFILTERCLAUSE>
diff -r 0d3bd59d94da -r e7f2a7b320ff
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html Wed Jan
26 14:02:30 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html Wed Jan
26 17:55:33 2011 +0100
@@ -90,8 +90,8 @@
}
function onloadFunctions() {
- keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null,
null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE',
false, 'frmMain', 'inpcElementValueIdFrom', 'inpElementValueIdFrom_DES',
document.frmMain.inpElementValueIdFrom_DES.value, 'inpcAcctSchemaId',
document.frmMain.inpcAcctSchemaId.value);", "inpElementValueIdFrom_DES",
"null");
- keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null,
null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE',
false, 'frmMain', 'inpcElementValueIdTo', 'inpElementValueIdTo_DES',
document.frmMain.inpElementValueIdTo_DES.value, 'inpcAcctSchemaId',
document.frmMain.inpcAcctSchemaId.value);", "inpElementValueIdTo_DES", "null");
+ keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null,
null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE',
false, 'frmMain', 'inpcElementValueIdFrom', 'inpElementValueIdFrom_DES',
document.frmMain.inpElementValueIdFrom_DES.value, 'inpcAcctSchemaId',
document.frmMain.inpcAcctSchemaId.value, 'Command', 'KEY');",
"inpElementValueIdFrom_DES", "null");
+ keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null,
null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE',
false, 'frmMain', 'inpcElementValueIdTo', 'inpElementValueIdTo_DES',
document.frmMain.inpElementValueIdTo_DES.value, 'inpcAcctSchemaId',
document.frmMain.inpcAcctSchemaId.value, 'Command', 'KEY');",
"inpElementValueIdTo_DES", "null");
}
</script>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
