details: https://code.openbravo.com/erp/devel/pi/rev/f1c53461ec96
changeset: 23952:f1c53461ec96
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Jul 01 17:11:20 2014 +0200
summary: Fixed issue 26984: 'Show Log' popup can be closed again
diffstat:
src/org/openbravo/erpCommon/ad_process/ApplyModules.html | 2 +-
src/org/openbravo/erpCommon/security/Login.html | 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
web/js/utils.js | 6 ++----
4 files changed, 5 insertions(+), 7 deletions(-)
diffs (59 lines):
diff -r b1843f200a90 -r f1c53461ec96
src/org/openbravo/erpCommon/ad_process/ApplyModules.html
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.html Tue Jul 01
16:54:52 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.html Tue Jul 01
17:11:20 2014 +0200
@@ -828,7 +828,7 @@
<tr>
<td colspan="4">
<div>
- <button type="button" id="buttonLog" class="ButtonLink"
onclick="openServletNewWindow('DEFAULT', false,
'../ad_forms/ShowLogFile.html?filePath=xx', 'Show Log', null, false, 600, 800,
null, null, false, null, true);" onfocus="buttonEvent('onfocus', this);
window.status='Show log'; return true;" onblur="buttonEvent('onblur', this);"
onkeyup="buttonEvent('onkeyup', this);" onkeydown="buttonEvent('onkeydown',
this);" onkeypress="buttonEvent('onkeypress', this);"
onmouseup="buttonEvent('onmouseup', this);"
onmousedown="buttonEvent('onmousedown', this);"
onmouseover="buttonEvent('onmouseover', this); window.status='Show log'; return
true;" onmouseout="buttonEvent('onmouseout', this);">
+ <button type="button" id="buttonLog" class="ButtonLink"
onclick="openServletNewWindow('DEFAULT', false,
'../ad_forms/ShowLogFile.html?filePath=xx', 'ShowLog', null, false, 600, 800,
null, null, false, null, true);" onfocus="buttonEvent('onfocus', this);
window.status='Show log'; return true;" onblur="buttonEvent('onblur', this);"
onkeyup="buttonEvent('onkeyup', this);" onkeydown="buttonEvent('onkeydown',
this);" onkeypress="buttonEvent('onkeypress', this);"
onmouseup="buttonEvent('onmouseup', this);"
onmousedown="buttonEvent('onmousedown', this);"
onmouseover="buttonEvent('onmouseover', this); window.status='Show log'; return
true;" onmouseout="buttonEvent('onmouseout', this);">
<table class="Button">
<tr>
<td class="Button_left"><img class="Button_Icon"
alt="Show log" title="Show log" src="../web/images/blank.gif" border="0"/></td>
diff -r b1843f200a90 -r f1c53461ec96
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Tue Jul 01 16:54:52
2014 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.html Tue Jul 01 17:11:20
2014 +0200
@@ -406,7 +406,7 @@
}
catch (e) { }
- if ((!revisionControl('22716')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('23952')) || (isOpsInstance() !=
isOpsInstanceCached())) {
maskLoginWindow(cacheMsg);
setLoginMessage('Warning', '', cacheMsg);
}
diff -r b1843f200a90 -r f1c53461ec96
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Tue Jul 01
16:54:52 2014 +0200
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Tue Jul 01
17:11:20 2014 +0200
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('22716')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('23952')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r b1843f200a90 -r f1c53461ec96 web/js/utils.js
--- a/web/js/utils.js Tue Jul 01 16:54:52 2014 +0200
+++ b/web/js/utils.js Tue Jul 01 17:11:20 2014 +0200
@@ -101,7 +101,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 = '22716';
+ var number = '23952';
return number;
}
@@ -984,9 +984,7 @@
var appUrl = getAppUrl();
var adds = "";
var isPopup = null;
- if (navigator.userAgent.toUpperCase().indexOf("MSIE") != -1) {
- _name = _name.replace(/ /g,"_"); //To fix strange issue with IE8 that
window name declared as var xx = window.open can not have spaces
- }
+ _name = _name.replace(/ /g,"_"); //The name should not contain spaces in
order to avoid problems with window.open and window.close operations
// Deprecated in 2.50, search for the old frameAplication and the new
appFrame
if (_name!='appFrame' && _name!='frameAplicacion' && _name!='frameMenu')
isPopup = true;
else isPopup = false;
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
