details: /erp/devel/pi/rev/d3fac6477542
changeset: 10343:d3fac6477542
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Feb 02 19:37:21 2011 +0100
summary: Solves form submission with Webkit based browser
details: /erp/devel/pi/rev/ae733868361c
changeset: 10344:ae733868361c
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Feb 02 19:38:14 2011 +0100
summary: Fixes location of common popups, fixes Menu call
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
| 10 +++++-----
src/org/openbravo/erpCommon/utility/VerticalMenu.java
| 1 +
web/js/utils.js
| 10 +++++-----
3 files changed, 11 insertions(+), 10 deletions(-)
diffs (90 lines):
diff -r 67d124c3a0d1 -r ae733868361c
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 Feb 02 19:09:42 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
Wed Feb 02 19:38:14 2011 +0100
@@ -346,9 +346,9 @@
isFramesetDraw: false,
isLoaded: false,
htmlCode: '<html><head></head><frameset cols="*, 0%" rows="*"
frameborder="no" border="0" framespacing="0">'+
- '<frame id="MDIPopupContainer"></frame>'+
+ '<frame id="MDIPopupContainer" name="MDIPopupContainer"></frame>'+
'<frame name="frameMenu" scrolling="no" src="' +
OB.Application.contextUrl +
- 'utility/VerticalMenu.html" id="paramFrameMenuLoading"></frame>'+
+ 'utility/VerticalMenu.html?Command=HIDE"
id="paramFrameMenuLoading"></frame>'+
'</frameset><body></body></html>',
popupURL: url
});
@@ -481,21 +481,21 @@
//
// Opens directly the "Instance Purpose" window inside a popup
openInstancePurpose: function(){
- cobcomp.Popup.open('InstancePurpose', 600, 500,
OB.Application.contextUrl + '/ad_forms/InstancePurpose.html', '', window,
false, false, true);
+ cobcomp.Popup.open('InstancePurpose', 600, 500,
OB.Application.contextUrl + 'ad_forms/InstancePurpose.html', '', window, false,
false, true);
},
// ** {{{ Popup.openHeartbeat() }}} **
//
// Opens directly the "Heartbeat" window inside a popup
openHeartbeat: function(){
- cobcomp.Popup.open('Heartbeat', 600, 500, OB.Application.contextUrl +
'/ad_forms/Heartbeat.html', '', window, false, false, true);
+ cobcomp.Popup.open('Heartbeat', 600, 500, OB.Application.contextUrl +
'ad_forms/Heartbeat.html', '', window, false, false, true);
},
// ** {{{ Popup.openRegistration() }}} **
//
// Opens directly the "Registration" window inside a popup
openRegistration: function(){
- cobcomp.Popup.open('Registration', 600, 500, OB.Application.contextUrl
+ '/ad_forms/Registration.html', '', window, false, false, true);
+ cobcomp.Popup.open('Registration', 600, 500, OB.Application.contextUrl
+ 'ad_forms/Registration.html', '', window, false, false, true);
}
}
};
diff -r 67d124c3a0d1 -r ae733868361c
src/org/openbravo/erpCommon/utility/VerticalMenu.java
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.java Wed Feb 02
19:09:42 2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.java Wed Feb 02
19:38:14 2011 +0100
@@ -175,6 +175,7 @@
xmlDocument.setParameter("menu", "");
xmlDocument.setParameter("userName", MenuData.getUserName(this,
vars.getUser()));
+ xmlDocument.setParameter("popup", "");
response.setContentType("text/html; charset=UTF-8");
final PrintWriter out = response.getWriter();
diff -r 67d124c3a0d1 -r ae733868361c web/js/utils.js
--- a/web/js/utils.js Wed Feb 02 19:09:42 2011 +0100
+++ b/web/js/utils.js Wed Feb 02 19:38:14 2011 +0100
@@ -696,7 +696,7 @@
* @type Boolean
*/
function submitCommandForm(action, bolValidation, form, newAction, newTarget,
bolOneFormSubmission, bolCheckChanges, isCallOut, controlEvt, evt) {
- if (form == null) form = document.forms[0];
+ var f = form || document.forms[0];
if (bolValidation!=null && bolValidation==true){
try { initialize_MessageBox('messageBoxID'); } catch (ignored) {}
if (!depurar_validate_wrapper(action, form, "")) return false;
@@ -710,13 +710,13 @@
dispatchEventChange(target);
}
if (gWaitingCallOut || (arrGeneralChange!=null && arrGeneralChange.length>0
&& bolCheckChanges)) {
- var strFunction = "submitCommandForm('" + action + "', " + bolValidation +
", " + form.name + ", " + ((newAction!=null)?("'" + newAction + "'"):"null") +
", " + ((newTarget!=null)?("'" + newTarget + "'"):"null") + ", " +
bolOneFormSubmission + ", " + bolCheckChanges + ")";
+ var strFunction = "submitCommandForm('" + action + "', " + bolValidation +
", " + f.name + ", " + ((newAction!=null)?("'" + newAction + "'"):"null") + ",
" + ((newTarget!=null)?("'" + newTarget + "'"):"null") + ", " +
bolOneFormSubmission + ", " + bolCheckChanges + ")";
reloadFunction(strFunction);
return false;
}
if (bolCheckChanges && !checkForChanges(form)) return false;
if (confirmAction(action)) {
- if (newAction != null) form.action = newAction;
+ if (newAction != null) f.action = newAction;
// Deprecated in 2.50, This code is only here fore backwards compatibility
// it allow callers which still use the old names to work
if ((newTarget != null) && (newTarget == 'frameAplicacion')) {
@@ -725,8 +725,8 @@
if ((newTarget != null) && (newTarget == 'frameOculto')) {
newTarget = 'hiddenFrame';
}
- if (newTarget != null) form.target = newTarget;
- submitForm(form.Command, action, form, bolOneFormSubmission, isCallOut);
+ if (newTarget != null) f.target = newTarget;
+ submitForm(f.Command, action, f, bolOneFormSubmission, isCallOut);
}
return true;
}
------------------------------------------------------------------------------
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
