details: https://code.openbravo.com/erp/devel/pi/rev/9119d097691b
changeset: 14205:9119d097691b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Nov 07 11:22:33 2011 +0100
summary: fixed bug 18772: Comborealoads not wokring on modal process popups
diffstat:
src-wad/src/org/openbravo/wad/Template_ActionButton.html | 1 +
src/org/openbravo/erpCommon/security/Login.html | 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
web/js/callOut.js | 13 ++++++++++++-
web/js/utils.js | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)
diffs (84 lines):
diff -r f997917b8d11 -r 9119d097691b
src-wad/src/org/openbravo/wad/Template_ActionButton.html
--- a/src-wad/src/org/openbravo/wad/Template_ActionButton.html Mon Nov 07
11:00:56 2011 +0100
+++ b/src-wad/src/org/openbravo/wad/Template_ActionButton.html Mon Nov 07
11:22:33 2011 +0100
@@ -99,6 +99,7 @@
</script>
</head>
<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
onLoad="onLoadDo();">
+<iframe name="hiddenFrame" style="display:none;"></iframe>
<form id="form" method="post" action="Window_Edition.html" name="frmMain">
<input type="hidden" name="Command">
<input type="hidden" name="inpLastFieldChanged">
diff -r f997917b8d11 -r 9119d097691b
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Mon Nov 07 11:00:56
2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.html Mon Nov 07 11:22:33
2011 +0100
@@ -388,7 +388,7 @@
}
catch (e) { }
- if ((!revisionControl('11668')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('11669')) || (isOpsInstance() !=
isOpsInstanceCached())) {
maskLoginWindow(cacheMsg);
setLoginMessage('Warning', '', cacheMsg);
}
diff -r f997917b8d11 -r 9119d097691b
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Mon Nov 07
11:00:56 2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Mon Nov 07
11:22:33 2011 +0100
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('11668')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('11669')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r f997917b8d11 -r 9119d097691b web/js/callOut.js
--- a/web/js/callOut.js Mon Nov 07 11:00:56 2011 +0100
+++ b/web/js/callOut.js Mon Nov 07 11:22:33 2011 +0100
@@ -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) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -32,6 +32,10 @@
function setgWaitingCallOut(state, frameName) {
if (frameName==null || frameName=="") frameName=frameDefault;
objFrame = eval("parent." + frameName);
+ if (!objFrame) {
+ // working in 3.0 modal window
+ objFrame = parent;
+ }
objFrame.setGWaitingCallOut(state);
}
@@ -46,6 +50,13 @@
if (arrResponse==null && (calloutName==null || calloutName=="")) return
false;
if (frameName==null || frameName=="") frameName=frameDefault;
objFrame = eval("parent." + frameName);
+ if (!objFrame) {
+ // working in 3.0 modal window
+ objFrame = parent;
+ if (!objFrame.fillElementsFromArray) {
+ return;
+ }
+ }
if (objFrame) {
objFrame.fillElementsFromArray(arrResponse, calloutName, formName);
try {
diff -r f997917b8d11 -r 9119d097691b web/js/utils.js
--- a/web/js/utils.js Mon Nov 07 11:00:56 2011 +0100
+++ b/web/js/utils.js Mon Nov 07 11:22:33 2011 +0100
@@ -95,7 +95,7 @@
* Return a number that would be checked at the Login screen to know if the
file is cached with the correct version
*/
function getCurrentRevision() {
- var number = '11668';
+ var number = '11669';
return number;
}
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
