details: /erp/devel/pi/rev/578dcf9eafae
changeset: 8495:578dcf9eafae
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Oct 04 13:14:33 2010 +0200
summary: Fixes issue 14756: Now getAppUrl works ok in popups and IE
diffstat:
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
web/js/utils.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diffs (33 lines):
diff -r 331c9ca70ae9 -r 578dcf9eafae
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Fri Oct 01
11:19:40 2010 +0200
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Mon Oct 04
13:14:33 2010 +0200
@@ -121,7 +121,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('8274')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('8495')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 331c9ca70ae9 -r 578dcf9eafae web/js/utils.js
--- a/web/js/utils.js Fri Oct 01 11:19:40 2010 +0200
+++ b/web/js/utils.js Mon Oct 04 13:14:33 2010 +0200
@@ -89,7 +89,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 = '8274';
+ var number = '8495';
return number;
}
@@ -2586,7 +2586,7 @@
function getAppUrl() {
var menuFrame = getFrame('frameMenu');
var appUrl = null;
- if (typeof menuFrame.getAppUrlFromMenu === "function") {
+ if (typeof menuFrame.getAppUrlFromMenu === "function" || typeof
menuFrame.getAppUrlFromMenu === "object") { //"object" clause related to issue
https://issues.openbravo.com/view.php?id=14756
appUrl = menuFrame.getAppUrlFromMenu();
}
return appUrl;
------------------------------------------------------------------------------
Virtualization is moving to the mainstream and overtaking non-virtualized
environment for deploying applications. Does it make network security
easier or more difficult to achieve? Read this whitepaper to separate the
two and get a better understanding.
http://p.sf.net/sfu/hp-phase2-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
