details: /erp/devel/pi/rev/d510eff80937
changeset: 7114:d510eff80937
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 10:37:18 2010 +0200
summary: fixed issue 13068: Reached 64k method size limit in
ComboReloadsProcessHelper.printPage
Created a new method per process
details: /erp/devel/pi/rev/ac28ad27304e
changeset: 7115:ac28ad27304e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 11:29:07 2010 +0200
summary: fixed issue 13068: Reached 64k method size limit in
ComboReloadsProcessHelper.printPage
Do not generate org callout in case there is not ad_org_id column
diffstat:
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml | 17 +++++++--
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.xml | 7 +++-
src-wad/src/org/openbravo/wad/Fields_data.xsql | 12 +++++++
src-wad/src/org/openbravo/wad/Wad.java | 11 +++++-
4 files changed, 40 insertions(+), 7 deletions(-)
diffs (129 lines):
diff -r 6f131867b08c -r ac28ad27304e
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml
--- a/src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml Thu Apr
22 10:15:36 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml Thu Apr
22 11:29:07 2010 +0200
@@ -12,7 +12,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) 2009 Openbravo SLU
+ * All portions are Copyright (C) 2009-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -40,6 +40,16 @@
String strProcessId = vars.getStringParameter("inpadProcessId");
<FIELDS_TMP id="sectionDetail">
if (strProcessId.equals("<FIELD_TMP id="fieldProcessId">xx</FIELD_TMP>"))
{
+ process<FIELD_TMP id="fieldProcessId"/>(response, vars, strTabId,
windowId);
+ return;
+ }
+ </FIELDS_TMP>
+
+ pageError(response);
+ }
+
+ <FIELDS_TMP id="sectionDetailProcess">
+ void process<FIELD_TMP
id="fieldProcessMethodId">xx</FIELD_TMP>(HttpServletResponse response,
VariablesSecureApp vars, String strTabId, String windowId) throws IOException,
ServletException {
String resultField;
String command = vars.getStringParameter("Command", "DEFAULT");
XmlDocument xmlDocument =
xmlEngine.readXmlTemplate("org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
@@ -47,7 +57,7 @@
StringBuffer resultado = new StringBuffer();
boolean isFirst=true;
ComboTableData comboTableData = null;
- resultado.append("var calloutName='ComboReloads<FIELD_TMP
id="fieldProcessId">xx</FIELD_TMP>';\n\n");
+ resultado.append("var calloutName='ComboReloads<FIELD_TMP
id="fieldProcessMethodId">xx</FIELD_TMP>';\n\n");
resultado.append("var respuesta = new Array(\n");
try {
@@ -75,8 +85,5 @@
return;
}
</FIELDS_TMP>
-
- pageError(response);
- }
}
</java_TMP>
diff -r 6f131867b08c -r ac28ad27304e
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.xml
--- a/src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.xml Thu Apr
22 10:15:36 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.xml Thu Apr
22 11:29:07 2010 +0200
@@ -12,7 +12,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) 2009 Openbravo SLU
+ * All portions are Copyright (C) 2009-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -27,6 +27,11 @@
<structure name="structure1">
<FIELD id="fieldProcessId">id</FIELD>
<SECTION id="sectionDetail"/>
+</structure>
+
+<structure name="structure2">
+ <FIELD id="fieldProcessMethodId">id</FIELD>
+ <SECTION id="sectionDetailProcess"/>
<SUBREPORT id="reportComboReloadsProcess" name="reportComboReloadsProcess"
report="org/openbravo/wad/ComboReloadsProcess" />
</structure>
diff -r 6f131867b08c -r ac28ad27304e
src-wad/src/org/openbravo/wad/Fields_data.xsql
--- a/src-wad/src/org/openbravo/wad/Fields_data.xsql Thu Apr 22 10:15:36
2010 +0200
+++ b/src-wad/src/org/openbravo/wad/Fields_data.xsql Thu Apr 22 11:29:07
2010 +0200
@@ -560,6 +560,18 @@
<Parameter name="processId"/>
</SqlMethod>
+ <SqlMethod name="processHasOrgParam" type="preparedStatement"
return="boolean">
+ <Sql>
+ <![CDATA[
+ select count(*)
+ from ad_process_para
+ where lower(columnname) = 'ad_org_id'
+ and ad_process_id = ?
+ ]]>
+ </Sql>
+ <Parameter name="processId"/>
+ </SqlMethod>
+
<SqlMethod name="selectColumnTable" type="preparedStatement"
return="multiple">
<SqlMethodComment>Fields of reference table in a tab</SqlMethodComment>
<Sql>
diff -r 6f131867b08c -r ac28ad27304e src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Thu Apr 22 10:15:36 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad.java Thu Apr 22 11:29:07 2010 +0200
@@ -3110,6 +3110,8 @@
if (data == null || data.length == 0)
return;
+ final boolean hasOrg = FieldsData.processHasOrgParam(pool, processId);
+
final Vector<Object> vecReloads = new Vector<Object>();
final Vector<Object> vecTotal = new Vector<Object>();
final Vector<Object> vecCounters = new Vector<Object>();
@@ -3125,8 +3127,14 @@
: "") + data[i].referencevalue;
data[i].columnname = "inp" +
Sqlc.TransformaNombreColumna(data[i].columnname);
data[i].whereclause = WadUtility.getComboReloadText(code, null, null,
vecReloads, "inp");
- if (data[i].whereclause.equals("") && data[i].type.equals("R"))
+ if (data[i].whereclause.equals("") && data[i].type.equals("R")) {
+ // Add combo reloads for all combo references in case there is a
ad_org parameter, if not
+ // only for the params with validation rule
+ if (!hasOrg) {
+ continue;
+ }
data[i].whereclause = "\"inpadOrgId\"";
+ }
if (data[i].reference.equals("17") && data[i].whereclause.equals(""))
data[i].whereclause = "\"inp" + data[i].columnname + "\"";
if (!data[i].whereclause.equals("")
@@ -3251,6 +3259,7 @@
}
xmlDocumentHelper.setData("structure1", processesGenerated);
+ xmlDocumentHelper.setData("structure2", processesGenerated);
xmlDocumentHelper.setDataArray("reportComboReloadsProcess",
"structure1", processData);
WadUtility.writeFile(fileDir, "ComboReloadsProcessHelper.java",
xmlDocumentHelper.print());
log4j.debug("created :" + fileDir + "/ComboReloadsProcessHelper.java");
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
